diff options
| author | Ville Syrjälä | 2014-08-06 13:49:45 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-06 22:39:23 +0200 |
| commit | 08c71e5e817a956389af5da5e99ab3e26d5c673d (patch) | |
| tree | 88aa0c1e1ded3f75cf6885a97830cce8788cf01d /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm: Always reject drm_vblank_get() after drm_vblank_off() (diff) | |
| download | kernel-qcow2-linux-08c71e5e817a956389af5da5e99ab3e26d5c673d.tar.gz kernel-qcow2-linux-08c71e5e817a956389af5da5e99ab3e26d5c673d.tar.xz kernel-qcow2-linux-08c71e5e817a956389af5da5e99ab3e26d5c673d.zip | |
drm/i915: Warn if drm_vblank_get() still works after drm_vblank_off()
v2: Drop the drm_vblank_off() (Daniel)
Use drm_crtc_vblank_{get,put}()
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.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.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 99eb7cad62a8..8f6b932d8e79 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1341,6 +1341,12 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv, } } +static void assert_vblank_disabled(struct drm_crtc *crtc) +{ + if (WARN_ON(drm_crtc_vblank_get(crtc) == 0)) + drm_crtc_vblank_put(crtc); +} + static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv) { u32 val; @@ -3905,6 +3911,8 @@ static void intel_crtc_enable_planes(struct drm_crtc *crtc) int pipe = intel_crtc->pipe; int plane = intel_crtc->plane; + assert_vblank_disabled(crtc); + drm_vblank_on(dev, pipe); intel_enable_primary_hw_plane(dev_priv, plane, pipe); @@ -3954,6 +3962,8 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc) intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe)); drm_vblank_off(dev, pipe); + + assert_vblank_disabled(crtc); } static void ironlake_crtc_enable(struct drm_crtc *crtc) |