From 56fd1f8868d8042aeb801a27a33c1ea3e05af33a Mon Sep 17 00:00:00 2001 From: Jack Xiao Date: Tue, 30 Apr 2024 13:58:28 +0800 Subject: [PATCH] drm/amdgpu/mes11: fix kiq ring ready flag kiq ring test has overwitten ready flag, need disable after gfx hw init. Signed-off-by: Jack Xiao Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c index d98f6d282ae75..8263b97c44666 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c @@ -1326,7 +1326,7 @@ static int mes_v11_0_hw_init(void *handle) struct amdgpu_device *adev = (struct amdgpu_device *)handle; if (adev->mes.ring.sched.ready) - return 0; + goto out; if (!adev->enable_mes_kiq) { if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) { @@ -1363,6 +1363,7 @@ static int mes_v11_0_hw_init(void *handle) goto failure; } +out: /* * Disable KIQ ring usage from the driver once MES is enabled. * MES uses KIQ ring exclusively so driver cannot access KIQ ring -- 2.39.5