From dcafbd50f2e4d5cc964aae409fb5691b743fba23 Mon Sep 17 00:00:00 2001

From: Felix Kuehling <Felix.Kuehling@amd.com>

Date: Thu, 5 Sep 2019 19:22:02 -0400

Subject: drm/amdgpu: Fix KFD-related kernel oops on Hawaii

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Git-commit: dcafbd50f2e4d5cc964aae409fb5691b743fba23

Patch-mainline: v5.4-rc1

References: bsc#1152489

Hawaii needs to flush caches explicitly, submitting an IB in a user

VMID from kernel mode. There is no s_fence in this case.

Fixes: eb3961a57424 ("drm/amdgpu: remove fence context from the job")

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

index 7850084a05e3..60655834d649 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

@@ -143,7 +143,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

 	/* ring tests don't use a job */

 	if (job) {

 		vm = job->vm;

-		fence_ctx = job->base.s_fence->scheduled.context;

+		fence_ctx = job->base.s_fence ?

+			job->base.s_fence->scheduled.context : 0;

 	} else {

 		vm = NULL;

 		fence_ctx = 0;

-- 

2.28.0