diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-01-20 11:25:35 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-01-20 18:20:58 -0500 |
| commit | 5d029339bb8ce69aeb68280c3de67d3cea456146 (patch) | |
| tree | 707c3d6731c78f8d1d50d7e0a24898b3ad428020 /drivers/gpu/drm/radeon | |
| parent | 407b6dfd9afa30cf963fa99bca91870e47965612 (diff) | |
| download | op-kernel-dev-5d029339bb8ce69aeb68280c3de67d3cea456146.zip op-kernel-dev-5d029339bb8ce69aeb68280c3de67d3cea456146.tar.gz | |
drm/radeon: add UVD support for OLAND
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -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 4b5c1fc..6781fee 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: |
