summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sprite.c
diff options
context:
space:
mode:
authorDaniel Vetter2015-02-13 21:03:45 +0100
committerDaniel Vetter2015-02-23 10:54:28 +0100
commit1e3feefd5a24da1685c518e20ba9624cd593d0a1 (patch)
tree6b313a85451e8a40067b5ccacd1310bfd6d22cc4 /drivers/gpu/drm/i915/intel_sprite.c
parentdrm/i915: Flatten DRIVER_MODESET checks in i915_irq.c (diff)
downloadkernel-qcow2-linux-1e3feefd5a24da1685c518e20ba9624cd593d0a1.tar.gz
kernel-qcow2-linux-1e3feefd5a24da1685c518e20ba9624cd593d0a1.tar.xz
kernel-qcow2-linux-1e3feefd5a24da1685c518e20ba9624cd593d0a1.zip
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: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index f2d408dd7c15..5ae56ecbca72 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -98,7 +98,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count)
if (min <= 0 || max <= 0)
return false;
- if (WARN_ON(drm_vblank_get(dev, pipe)))
+ if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
return false;
local_irq_disable();
@@ -132,7 +132,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count)
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);