diff options
author | Mark Brown <[email protected]> | 2024-10-22 23:18:45 +0100 |
---|---|---|
committer | Mark Brown <[email protected]> | 2024-10-22 23:18:45 +0100 |
commit | 5ddc236d094d496bcd1e78aaa88bdde530073b6f (patch) | |
tree | 2435f76086b7bbf9739c05411baa2f1520cd9618 /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
parent | 0d214f27c0e3d9694284c95bac1502c2d247355b (diff) | |
parent | 602ff58ae4fe4289b0ca71cba9fb82f7de92cd64 (diff) |
regulator: init_data handling update
Merge series from Jerome Brunet <[email protected]>:
This patchset groups the regulator patches around the init_data topic
discussed on pmbus write protect patchset [1]
[1]: https://lore.kernel.org/r/[email protected]
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; } |