Merge drm/drm-next into drm-intel-gt-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gt / intel_ring_submission.c

diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 356c787e11d38fbb489dfc88eb276c486d2a4a44..827adb0cfaea6a49617a80f3bb69c69a13021da3 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -897,7 +897,7 @@ static int clear_residuals(struct i915_request *rq)
        }
 
        ret = engine->emit_bb_start(rq,
-                                   engine->wa_ctx.vma->node.start, 0,
+                                   i915_vma_offset(engine->wa_ctx.vma), 0,
                                    0);
        if (ret)
                return ret;