aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-01-30 13:01:16 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-22 15:41:27 -0500
commit41ce42d4249cea29cc12cf3e7da9840ee2e5a81e (patch)
treea7317329569376947dafdf453a73f49ebd2693df
parent1dd657f51365243577666beba4ee0644a6feeec6 (diff)
drm/radeon: fix UVD IRQ support on SI
commit b927e1c20462c1ad9caf4c4fa3a30e838a2d4037 upstream. 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> 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/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 3cf38ff09e70..03add5d5542e 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -5159,6 +5159,10 @@ restart_ih:
5159 break; 5159 break;
5160 } 5160 }
5161 break; 5161 break;
5162 case 124: /* UVD */
5163 DRM_DEBUG("IH: UVD int: 0x%08x\n", src_data);
5164 radeon_fence_process(rdev, R600_RING_TYPE_UVD_INDEX);
5165 break;
5162 case 146: 5166 case 146:
5163 case 147: 5167 case 147:
5164 dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data); 5168 dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);