Commit 1e3feefd authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Switch to drm_crtc variants of vblank functions

Where possible right now. Just a small step towards nirvana ...

v2: git add. Uggh. Noticed by Imre.

Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent f3a5c3f6
...@@ -580,7 +580,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) ...@@ -580,7 +580,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n", seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n",
work->flip_queued_vblank, work->flip_queued_vblank,
work->flip_ready_vblank, work->flip_ready_vblank,
drm_vblank_count(dev, crtc->pipe)); drm_crtc_vblank_count(&crtc->base));
if (work->enable_stall_check) if (work->enable_stall_check)
seq_puts(m, "Stall check enabled, "); seq_puts(m, "Stall check enabled, ");
else else
......
...@@ -9661,10 +9661,10 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, ...@@ -9661,10 +9661,10 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev,
!i915_gem_request_completed(work->flip_queued_req, true)) !i915_gem_request_completed(work->flip_queued_req, true))
return false; return false;
work->flip_ready_vblank = drm_vblank_count(dev, intel_crtc->pipe); work->flip_ready_vblank = drm_crtc_vblank_count(crtc);
} }
if (drm_vblank_count(dev, intel_crtc->pipe) - work->flip_ready_vblank < 3) if (drm_crtc_vblank_count(crtc) - work->flip_ready_vblank < 3)
return false; return false;
/* Potential stall - if we see that the flip has happened, /* Potential stall - if we see that the flip has happened,
...@@ -9695,7 +9695,8 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) ...@@ -9695,7 +9695,8 @@ void intel_check_page_flip(struct drm_device *dev, int pipe)
spin_lock(&dev->event_lock); spin_lock(&dev->event_lock);
if (intel_crtc->unpin_work && __intel_pageflip_stall_check(dev, crtc)) { if (intel_crtc->unpin_work && __intel_pageflip_stall_check(dev, crtc)) {
WARN_ONCE(1, "Kicking stuck page flip: queued at %d, now %d\n", WARN_ONCE(1, "Kicking stuck page flip: queued at %d, now %d\n",
intel_crtc->unpin_work->flip_queued_vblank, drm_vblank_count(dev, pipe)); intel_crtc->unpin_work->flip_queued_vblank,
drm_vblank_count(dev, pipe));
page_flip_completed(intel_crtc); page_flip_completed(intel_crtc);
} }
spin_unlock(&dev->event_lock); spin_unlock(&dev->event_lock);
...@@ -9837,7 +9838,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -9837,7 +9838,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
intel_ring_get_request(ring)); intel_ring_get_request(ring));
} }
work->flip_queued_vblank = drm_vblank_count(dev, intel_crtc->pipe); work->flip_queued_vblank = drm_crtc_vblank_count(crtc);
work->enable_stall_check = true; work->enable_stall_check = true;
i915_gem_track_fb(intel_fb_obj(work->old_fb), obj, i915_gem_track_fb(intel_fb_obj(work->old_fb), obj,
......
...@@ -98,7 +98,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) ...@@ -98,7 +98,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count)
if (min <= 0 || max <= 0) if (min <= 0 || max <= 0)
return false; return false;
if (WARN_ON(drm_vblank_get(dev, pipe))) if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
return false; return false;
local_irq_disable(); local_irq_disable();
...@@ -132,7 +132,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) ...@@ -132,7 +132,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count)
finish_wait(wq, &wait); finish_wait(wq, &wait);
drm_vblank_put(dev, pipe); drm_crtc_vblank_put(&crtc->base);
*start_vbl_count = dev->driver->get_vblank_counter(dev, pipe); *start_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment