drm/i915: Use dma-fence driver and timeline name helpers

Access the dma-fence internals via the previously added helpers.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20250515095004.28318-6-tvrtko.ursulin@igalia.com

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
index d1a382dfaa1dfc6fec971e12118ea2f7401523c3..ae3557ed6c1e4e2d9db5a62e9075a1ecd4055d81 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
@@ -252,8 +252,8 @@ void intel_gt_watchdog_work(struct work_struct *work)
                        struct dma_fence *f = &rq->fence;
 
                        pr_notice("Fence expiration time out i915-%s:%s:%llx!\n",
-                                 f->ops->get_driver_name(f),
-                                 f->ops->get_timeline_name(f),
+                                 dma_fence_driver_name(f),
+                                 dma_fence_timeline_name(f),
                                  f->seqno);
                        i915_request_cancel(rq, -EINTR);
                }

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index c3d27eadc0a7e3ff899e89c0e66a9715a255b837..4874c4f1e4ab6047e96c79e75db5fe6135241b1c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -2184,7 +2184,7 @@ void i915_request_show(struct drm_printer *m,
                       const char *prefix,
                       int indent)
 {
-       const char *name = rq->fence.ops->get_timeline_name((struct dma_fence *)&rq->fence);
+       const char *name = dma_fence_timeline_name((struct dma_fence *)&rq->fence);
        char buf[80] = "";
        int x = 0;
 

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index 1d4cc91c0e40d588df58bfaca5b26f0117cf2c0f..e51ca7e50a4e8c43e624a96582977345b9367610 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -435,8 +435,8 @@ static void timer_i915_sw_fence_wake(struct timer_list *t)
                return;
 
        pr_notice("Asynchronous wait on fence %s:%s:%llx timed out (hint:%ps)\n",
-                 cb->dma->ops->get_driver_name(cb->dma),
-                 cb->dma->ops->get_timeline_name(cb->dma),
+                 dma_fence_driver_name(cb->dma),
+                 dma_fence_timeline_name(cb->dma),
                  cb->dma->seqno,
                  i915_sw_fence_debug_hint(fence));