summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
diff options
context:
space:
mode:
authorJack Xiao <Jack.Xiao@amd.com>2024-04-30 13:58:28 +0800
committerAlex Deucher <alexander.deucher@amd.com>2024-05-08 15:17:04 -0400
commit56fd1f8868d8042aeb801a27a33c1ea3e05af33a (patch)
treebd0b304dac9c960bf17114e6c97bba8e1a8d052a /drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
parent89773b85599affe89dfc030aa1cb70d6ca7de4d3 (diff)
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 <Jack.Xiao@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mes_v11_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/mes_v11_0.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index d98f6d282ae7..8263b97c4466 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