From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 15 Aug 2024 16:58:14 +0000 (-0400)
Subject: drm/amdgpu/gfx12: return early in preempt_ib()
X-Git-Tag: microblaze-v6.13~18^2~10^2~39
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1125f95cd2455b51ad1c16d7f96ae39117083d20;p=linux-2.6-microblaze.git

drm/amdgpu/gfx12: return early in preempt_ib()

When MES is enabled KIQ is not available.  Return an error
when someone uses the debugfs preempt test interface in
that case.

Acked-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 54059cbcfc08..6f700800f346 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -4501,6 +4501,9 @@ static int gfx_v12_0_ring_preempt_ib(struct amdgpu_ring *ring)
 	struct amdgpu_ring *kiq_ring = &kiq->ring;
 	unsigned long flags;
 
+	if (adev->enable_mes)
+		return -EINVAL;
+
 	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)
 		return -EINVAL;