From: Sunil Khatri <sunil.khatri@amd.com>
Date: Thu, 17 Apr 2025 10:27:26 +0000 (+0530)
Subject: drm/amdgpu/userq: add context and seqno of the fence
X-Git-Tag: v6.16-rc1~144^2~10^2~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9018c7fe68b55f7ca0df65f0c048dcb6acea90ed;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu/userq: add context and seqno of the fence

Add context and seqno of the fence in error logging
rather than printing fence ptr.

Reviewed-by: Christian König <christian.koenig@amd.com>
Suggested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
index 149993ec537b2..5f87cc8b5bf4f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
@@ -44,7 +44,8 @@ amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
 	if (f && !dma_fence_is_signaled(f)) {
 		ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
 		if (ret <= 0) {
-			DRM_ERROR("Timed out waiting for fence f=%p\n", f);
+			DRM_ERROR("Timed out waiting for fence=%llu:%llu\n",
+				  f->context, f->seqno);
 			return;
 		}
 	}
@@ -654,7 +655,8 @@ amdgpu_userqueue_wait_for_signal(struct amdgpu_userq_mgr *uq_mgr)
 			continue;
 		ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
 		if (ret <= 0) {
-			DRM_ERROR("Timed out waiting for fence f=%p\n", f);
+			DRM_ERROR("Timed out waiting for fence=%llu:%llu\n",
+				  f->context, f->seqno);
 			return -ETIMEDOUT;
 		}
 	}