summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-01-30 19:01:16 +0100
committerAlex Deucher <alexander.deucher@amd.com>2014-02-06 18:22:44 +0100
commitb927e1c20462c1ad9caf4c4fa3a30e838a2d4037 (patch)
treea2a4536e30660b57ceef97377bd469fed3833c85 /drivers
parentdrm/radeon: allow geom rings to be setup on r600/r700 (v2) (diff)
downloadlinux-b927e1c20462c1ad9caf4c4fa3a30e838a2d4037.tar.xz
linux-b927e1c20462c1ad9caf4c4fa3a30e838a2d4037.zip
drm/radeon: fix UVD IRQ support on SI
Otherwise decoding isn't really useable. bug: https://bugs.freedesktop.org/show_bug.cgi?id=71448 Signed-off-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/si.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 09ec4f6c53bb..83578324e5d1 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -6338,6 +6338,10 @@ restart_ih:
break;
}
break;
+ case 124: /* UVD */
+ DRM_DEBUG("IH: UVD int: 0x%08x\n", src_data);
+ radeon_fence_process(rdev, R600_RING_TYPE_UVD_INDEX);
+ break;
case 146:
case 147:
addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);