aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2014-11-24 13:49:35 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-12-03 03:35:19 -0500
commit9c654818295eee21720e62040e235e6951b05b40 (patch)
tree0578ceeb092e4babb6d0c3407e786026413a96c1 /drivers/gpu/drm/i915/intel_display.c
parentcc8c4cc2a0cee06ecdd27aa654e26ec3b2b05048 (diff)
drm/i915: Convert __wait_seqno() to __wait_request()
Now that all code above is using request structures instead of seqno values, it is possible to convert __wait_seqno() itself. Internally, it is still calling i915_seqno_passed(), this will be updated later in the series. This step is just changing the parameter list and function name. For: VIZ-4377 Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Thomas Daniel <Thomas.Daniel@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 61c402485f36..0eaa1f48efcf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9618,10 +9618,9 @@ static void intel_mmio_flip_work_func(struct work_struct *work)
9618 9618
9619 mmio_flip = &crtc->mmio_flip; 9619 mmio_flip = &crtc->mmio_flip;
9620 if (mmio_flip->req) 9620 if (mmio_flip->req)
9621 WARN_ON(__i915_wait_seqno(i915_gem_request_get_ring(mmio_flip->req), 9621 WARN_ON(__i915_wait_request(mmio_flip->req,
9622 i915_gem_request_get_seqno(mmio_flip->req), 9622 crtc->reset_counter,
9623 crtc->reset_counter, 9623 false, NULL, NULL) != 0);
9624 false, NULL, NULL) != 0);
9625 9624
9626 intel_do_mmio_flip(crtc); 9625 intel_do_mmio_flip(crtc);
9627 if (mmio_flip->req) { 9626 if (mmio_flip->req) {