1 files changed, 35 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2575-drm-amdgpu-add-job-preamble_status-back-to-status-va.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2575-drm-amdgpu-add-job-preamble_status-back-to-status-va.patch
new file mode 100644
index 00000000..9838cdda
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2575-drm-amdgpu-add-job-preamble_status-back-to-status-va.patch
@@ -0,0 +1,35 @@
+From d54be05ab33b5f084f8df829e3f4450eba6d1be0 Mon Sep 17 00:00:00 2001
+From: Jack Xiao <Jack.Xiao@amd.com>
+Date: Fri, 21 Jun 2019 18:17:38 -0500
+Subject: [PATCH 2575/2940] drm/amdgpu: add job->preamble_status back to status
+ value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+job->preamble_status was accidently dropped from the combination value
+of status varaiable which is the parameter of some ring level function.
+The patch is to add it back.
+
+Acked-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+index e114e9d9cd35..210a6fd5676a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+@@ -216,6 +216,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
+ 
+ 	skip_preamble = ring->current_ctx == fence_ctx;
+ 	if (job && ring->funcs->emit_cntxcntl) {
++		status |= job->preamble_status;
+ 		status |= job->preemption_status;
+ 		amdgpu_ring_emit_cntxcntl(ring, status);
+ 	}
+-- 
+2.17.1
+