From: Boyuan Zhang <boyuan.zhang@amd.com>
Date: Wed, 18 Jul 2018 20:26:28 +0000 (-0400)
Subject: drm/amdgpu: add emit trap for vcn jpeg
X-Git-Tag: Ubuntu-5.10.0-12.13~6719^2~24^2~347
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36a12bd0b4239ef11178344525c6d0b912b0b230;p=mirror_ubuntu-hirsute-kernel.git

drm/amdgpu: add emit trap for vcn jpeg

Add emit trap command in jpeg emit fence call.

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Acked-by: Leo Liu <leo.liu at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 8d84e2e50636..aa21f667ff47 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -1340,6 +1340,10 @@ static void vcn_v1_0_jpeg_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u6
 	amdgpu_ring_write(ring,
 		PACKETJ(0, 0, 0, PACKETJ_TYPE0));
 	amdgpu_ring_write(ring, 0x1);
+
+	/* emit trap */
+	amdgpu_ring_write(ring, PACKETJ(0, 0, 0, PACKETJ_TYPE7));
+	amdgpu_ring_write(ring, 0);
 }
 
 /**