From: Christian König <christian.koenig@amd.com>
Date: Thu, 30 Jan 2014 18:01:16 +0000 (+0100)
Subject: drm/radeon: fix UVD IRQ support on SI
X-Git-Tag: firefly_0821_release~3679^2~2799
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41ce42d4249cea29cc12cf3e7da9840ee2e5a81e;p=firefly-linux-kernel-4.4.55.git

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>
---

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:
 				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:
 			dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);