Skip to contentSkip to conversation

drm/amdgpu/fence: handle NULL guilty fence in reemit path

PATCH New Jesse Zhang 1 participant 1 message Jun 12

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/fence: handle NULL guilty fence in reemit path

amdgpu_ring_set_fence_errors_and_reemit() unconditionally dereferenced guilty_fence when ring_backup_entries_to_copy is zero, which can happen when queue reset runs without a tracked guilty fence.

Pass NULL safely to amdgpu_fence_driver_force_completion() when no guilty fence is available, avoiding a NULL pointer dereference while keeping reset/recovery flow unchanged.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +2 -1
index 3043ad041bb4..ff1a82a4cdac 100644
@@ -733,7 +733,8 @@ void amdgpu_ring_set_fence_errors_and_reemit(struct amdgpu_ring *ring,
 	 * we are skipping it on purpose.
 	 */
 	if (!ring->ring_backup_entries_to_copy) {
-		amdgpu_fence_driver_force_completion(ring, &guilty_fence->base);
+		amdgpu_fence_driver_force_completion(ring,
+			guilty_fence ? &guilty_fence->base : NULL);
 		return;
 	}
 	ring->reemit = true;
Signature · 1 line
2.49.0