Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c71e5e authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7ffd7a68

drivers/gpu/drm/i915/intel_display.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -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)

static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)

{

{

	u32 val;

	u32 val;
@@ -3905,6 +3911,8 @@ static void intel_crtc_enable_planes(struct drm_crtc *crtc) 
	int pipe = intel_crtc->pipe;

	int pipe = intel_crtc->pipe;

	int plane = intel_crtc->plane;

	int plane = intel_crtc->plane;





	assert_vblank_disabled(crtc);



	drm_vblank_on(dev, pipe);

	drm_vblank_on(dev, pipe);





	intel_enable_primary_hw_plane(dev_priv, plane, 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));

	intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe));





	drm_vblank_off(dev, pipe);

	drm_vblank_off(dev, pipe);



	assert_vblank_disabled(crtc);

}

}





static void ironlake_crtc_enable(struct drm_crtc *crtc)

static void ironlake_crtc_enable(struct drm_crtc *crtc)