diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-01-20 16:25:35 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 21:50:21 (GMT) |
| commit | 2fd1fcbd994ab394128c130824b27246986e531e (patch) | |
| tree | f71532c3e891789cf119037d1677f91e0f0e12a8 | |
| parent | 177489b636ca008b0aa74a880c7b409513deba3a (diff) | |
| download | linux-fsl-qoriq-2fd1fcbd994ab394128c130824b27246986e531e.tar.xz | |
drm/radeon: add UVD support for OLAND
commit 5d029339bb8ce69aeb68280c3de67d3cea456146 upstream.
It seems this got dropped when we merged UVD support
last year. Add this back now.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_uvd.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/uvd_v2_2.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c index 1d029cc..6d916fc 100644 --- a/drivers/gpu/drm/radeon/radeon_uvd.c +++ b/drivers/gpu/drm/radeon/radeon_uvd.c @@ -91,6 +91,7 @@ int radeon_uvd_init(struct radeon_device *rdev) case CHIP_VERDE: case CHIP_PITCAIRN: case CHIP_ARUBA: + case CHIP_OLAND: fw_name = FIRMWARE_TAHITI; break; diff --git a/drivers/gpu/drm/radeon/uvd_v2_2.c b/drivers/gpu/drm/radeon/uvd_v2_2.c index b19ef49..824550d 100644 --- a/drivers/gpu/drm/radeon/uvd_v2_2.c +++ b/drivers/gpu/drm/radeon/uvd_v2_2.c @@ -153,6 +153,7 @@ int uvd_v2_2_resume(struct radeon_device *rdev) chip_id = 0x01000015; break; case CHIP_PITCAIRN: + case CHIP_OLAND: chip_id = 0x01000016; break; case CHIP_ARUBA: |