Skip to contentSkip to conversation

drm/amd/gfx11: move the gfx mutex into the caller

PATCH In review Alex Deucher 3 participants 3 messages Aug 20, 2024

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/1 drm/amd/gfx11: move the gfx mutex into the caller

Otherwise we can fail to drop the software mutex when we fail to take the hardware mutex.

Fixes 76acba7b7f12 ("drm/amdgpu/gfx11: add a mutex for the gfx semaphore")
---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +3 -4
index 5704ad25a49d6..aa7fdece8ad42 100644
@@ -4747,8 +4747,6 @@ int gfx_v11_0_request_gfx_index_mutex(struct amdgpu_device *adev,
 {
 	u32 i, tmp, val;
 
-	if (req)
-		mutex_lock(&adev->gfx.reset_sem_mutex);
 	for (i = 0; i < adev->usec_timeout; i++) {
 		/* Request with MeId=2, PipeId=0 */
 		tmp = REG_SET_FIELD(0, CP_GFX_INDEX_MUTEX, REQUEST, req);
@@ -4769,8 +4767,6 @@ int gfx_v11_0_request_gfx_index_mutex(struct amdgpu_device *adev,
 		}
 		udelay(1);
 	}
-	if (!req)
-		mutex_unlock(&adev->gfx.reset_sem_mutex);
 
 	if (i >= adev->usec_timeout)
 		return -EINVAL;
@@ -4818,8 +4814,10 @@ static int gfx_v11_0_soft_reset(void *handle)
 	mutex_unlock(&adev->srbm_mutex);
 
 	/* Try to acquire the gfx mutex before access to CP_VMID_RESET */
+	mutex_lock(&adev->gfx.reset_sem_mutex);
 	r = gfx_v11_0_request_gfx_index_mutex(adev, true);
 	if (r) {
+		mutex_unlock(&adev->gfx.reset_sem_mutex);
 		DRM_ERROR("Failed to acquire the gfx mutex during soft reset\n");
 		return r;
 	}
@@ -4834,6 +4832,7 @@ static int gfx_v11_0_soft_reset(void *handle)
 
 	/* release the gfx mutex */
 	r = gfx_v11_0_request_gfx_index_mutex(adev, false);
+	mutex_unlock(&adev->gfx.reset_sem_mutex);
 	if (r) {
 		DRM_ERROR("Failed to release the gfx mutex during soft reset\n");
 		return r;
Signature · 1 line
2.46.0
Acked-by on v1 1/1
#2 lore raw
In reply to Alex Deucher
Quoted 44 lines · Alex Deucher

Otherwise we can fail to drop the software mutex when we fail to take the hardware mutex.

Fixes 76acba7b7f12 ("drm/amdgpu/gfx11: add a mutex for the gfx semaphore")
---
  drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +2 -4
index 5704ad25a49d6..aa7fdece8ad42 100644
@@ -4747,8 +4747,6 @@ int gfx_v11_0_request_gfx_index_mutex(struct amdgpu_device *adev,
  {
  	u32 i, tmp, val;
 
-	if (req)
-		mutex_lock(&adev->gfx.reset_sem_mutex);
  	for (i = 0; i < adev->usec_timeout; i++) {
  		/* Request with MeId=2, PipeId=0 */
  		tmp = REG_SET_FIELD(0, CP_GFX_INDEX_MUTEX, REQUEST, req);
@@ -4769,8 +4767,6 @@ int gfx_v11_0_request_gfx_index_mutex(struct amdgpu_device *adev,
  		}
  		udelay(1);
  	}
-	if (!req)
-		mutex_unlock(&adev->gfx.reset_sem_mutex);
 
  	if (i >= adev->usec_timeout)
  		return -EINVAL;
@@ -4818,8 +4814,10 @@ static int gfx_v11_0_soft_reset(void *handle)
  	mutex_unlock(&adev->srbm_mutex);
 
  	/* Try to acquire the gfx mutex before access to CP_VMID_RESET */
+	mutex_lock(&adev->gfx.reset_sem_mutex);
  	r = gfx_v11_0_request_gfx_index_mutex(adev, true);
  	if (r) {
+		mutex_unlock(&adev->gfx.reset_sem_mutex);
  		DRM_ERROR("Failed to acquire the gfx mutex during soft reset\n");
  		return r;
  	}

drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c static int gfx_v11_0_soft_reset(void *handle) · line 4838

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +1 -0
@@ -4834,6 +4832,7 @@ static int gfx_v11_0_soft_reset(void *handle)
 
  	/* release the gfx mutex */
  	r = gfx_v11_0_request_gfx_index_mutex(adev, false);
+	mutex_unlock(&adev->gfx.reset_sem_mutex);
  	if (r) {
  		DRM_ERROR("Failed to release the gfx mutex during soft reset\n");
  		return r;

By moving locking and unlocking of the mutex to the gfx_v11_0_soft_reset function (the caller). This ensures that the mutex is always unlocked, regardless of whether (indicated by if (i >= adev->usec_timeout)) succeeds or fails.