summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-05-21 17:14:18 +0200
committerAlex Deucher <alexander.deucher@amd.com>2013-05-29 11:35:03 -0400
commit27b0705c68dab67a6c8ffa19869aeca3eaf75d78 (patch)
tree4e78c39b71ee57afd79e6d55f83deac466d0a430 /drivers
parentc89b65e7fffef745bdd36c372aa0dea778fecbab (diff)
downloadlinux-stable-27b0705c68dab67a6c8ffa19869aeca3eaf75d78.tar.gz
linux-stable-27b0705c68dab67a6c8ffa19869aeca3eaf75d78.tar.bz2
linux-stable-27b0705c68dab67a6c8ffa19869aeca3eaf75d78.zip
drm/radeon: UVD block on SUMO2 is the same as on SUMO
The chip id for SUMO2 isn't used. fixes: https://bugs.freedesktop.org/show_bug.cgi?id=63935 Tested-By: Dave Witbrodt <dawitbro@sbcglobal.net> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/rv770.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 83f612a9500b..3fc2985445ee 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -862,10 +862,8 @@ int rv770_uvd_resume(struct radeon_device *rdev)
chip_id = 0x0100000b;
break;
case CHIP_SUMO:
- chip_id = 0x0100000c;
- break;
case CHIP_SUMO2:
- chip_id = 0x0100000d;
+ chip_id = 0x0100000c;
break;
case CHIP_PALM:
chip_id = 0x0100000e;