drm/i915: Rearrange i915_wait_request() accounting with callers

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_breadcrumbs.c

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 23fc1042fed477655df84ae0c5f34d87208e84e5..56efcc507ea2c181d53beea696025fa59d052f44 100644 (file)
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -464,7 +464,7 @@ static int intel_breadcrumbs_signaler(void *arg)
                                                 &request->signaling.wait);
 
                        local_bh_disable();
-                       fence_signal(&request->fence);
+                       dma_fence_signal(&request->fence);
                        local_bh_enable(); /* kick start the tasklets */
 
                        /* Find the next oldest signal. Note that as we have
@@ -502,7 +502,7 @@ void intel_engine_enable_signaling(struct drm_i915_gem_request *request)
        struct rb_node *parent, **p;
        bool first, wakeup;
 
-       /* locked by fence_enable_sw_signaling() */
+       /* locked by dma_fence_enable_sw_signaling() */
        assert_spin_locked(&request->lock);
 
        request->signaling.wait.tsk = b->signaler;