On 5/9/25 17:33, Tvrtko Ursulin wrote:
> Access the dma-fence internals via the previously added helpers.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@igalia.com>
Reviewed-by: Christian König <christian.koe...@amd.com>
> ---
> drivers/gpu/drm/i915/gt/intel_gt_requests.c | 4 ++--
> drivers/gpu/drm/i915/i915_request.c | 2 +-
> drivers/gpu/drm/i915/i915_sw_fence.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> index d1a382dfaa1d..ae3557ed6c1e 100644
> --- 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 c3d27eadc0a7..4874c4f1e4ab 100644
> --- 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 1d4cc91c0e40..e51ca7e50a4e 100644
> --- 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));
>
