diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-10-18 06:13:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-10-18 06:13:19 +1000 |
| commit | 01541a87064f9e5d336fd8e2e397fd16e567b484 (patch) | |
| tree | 35fc1fabbccafb10feebb05e93f17e78dcfea7c5 /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
| parent | 4cd33d972e0ff596df99db9afcc37e50d1772b48 (diff) | |
| parent | ec1aab7816b06c32f42935e34ce3a3040c778afb (diff) | |
| download | linux-next-01541a87064f9e5d336fd8e2e397fd16e567b484.tar.gz linux-next-01541a87064f9e5d336fd8e2e397fd16e567b484.zip | |
Merge tag 'amd-drm-fixes-6.12-2024-10-16' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.12-2024-10-16:
amdgpu:
- SR-IOV fix
- CS chunk handling fix
- MES fixes
- SMU13 fixes
amdkfd:
- VRAM usage reporting fix
radeon:
- Fix possible_clones handling
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241016200514.3520286-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index 10b61ff63802..7d4b540340e0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -1203,8 +1203,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, r = amdgpu_ring_init(adev, ring, 1024, NULL, 0, AMDGPU_RING_PRIO_DEFAULT, NULL); - if (r) + if (r) { + amdgpu_mes_unlock(&adev->mes); goto clean_up_memory; + } amdgpu_mes_ring_to_queue_props(adev, ring, &qprops); @@ -1237,7 +1239,6 @@ clean_up_ring: amdgpu_ring_fini(ring); clean_up_memory: kfree(ring); - amdgpu_mes_unlock(&adev->mes); return r; } |