summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2015-11-17 15:28:29 +0100
committerAlex Deucher2015-11-21 00:20:55 +0100
commitd6c29c30eaac8a0d6c8c8f44a2c61d3443c51707 (patch)
treec1c660a2b022ea85037c1fb6c581d30a5b40a3f8
parentMerge tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-i... (diff)
downloadkernel-qcow2-linux-d6c29c30eaac8a0d6c8c8f44a2c61d3443c51707.tar.gz
kernel-qcow2-linux-d6c29c30eaac8a0d6c8c8f44a2c61d3443c51707.tar.xz
kernel-qcow2-linux-d6c29c30eaac8a0d6c8c8f44a2c61d3443c51707.zip
drm/amdgpu: reset vce trap interrupt flag
Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vce_v3_0.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 6a52db6ad8d7..3acff3ab764f 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -576,6 +576,11 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev,
struct amdgpu_iv_entry *entry)
{
DRM_DEBUG("IH: VCE\n");
+
+ WREG32_P(mmVCE_SYS_INT_STATUS,
+ VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK,
+ ~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK);
+
switch (entry->src_data) {
case 0:
amdgpu_fence_process(&adev->vce.ring[0]);