Commit 407b9405 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move assert_vblank_disabled() into intel_crtc_vblank_on() 



Move the assert_vblank_disabled() into intel_crtc_vblank_on()
so that we don't have to inline it all over.

This does mean we now assert_vblank_disabled() during readout as well
but that is totally fine as it happens after drm_crtc_vblank_reset().
One can even argue it's what we want to do anyway to make sure
the reset actually happened.

Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191118164430.27265-4-ville.syrjala@linux.intel.com
parent d18b6bb8

drivers/gpu/drm/i915/display/intel_display.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1838,6 +1838,7 @@ static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state) 
{

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);




















	assert_vblank_disabled(&crtc->base);











	drm_crtc_set_max_vblank_count(&crtc->base,







	drm_crtc_set_max_vblank_count(&crtc->base,











				      intel_crtc_max_vblank_count(crtc_state));







				      intel_crtc_max_vblank_count(crtc_state));











	drm_crtc_vblank_on(&crtc->base);







	drm_crtc_vblank_on(&crtc->base);










@@ -6547,7 +6548,6 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,









	if (pipe_config->has_pch_encoder)







	if (pipe_config->has_pch_encoder)











		ironlake_pch_enable(state, pipe_config);







		ironlake_pch_enable(state, pipe_config);



























	assert_vblank_disabled(crtc);














	intel_crtc_vblank_on(pipe_config);







	intel_crtc_vblank_on(pipe_config);



























	intel_encoders_enable(state, intel_crtc);







	intel_encoders_enable(state, intel_crtc);










@@ -6713,7 +6713,6 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,









	if (pipe_config->has_pch_encoder)







	if (pipe_config->has_pch_encoder)











		lpt_pch_enable(state, pipe_config);







		lpt_pch_enable(state, pipe_config);



























	assert_vblank_disabled(crtc);














	intel_crtc_vblank_on(pipe_config);







	intel_crtc_vblank_on(pipe_config);



























	intel_encoders_enable(state, intel_crtc);







	intel_encoders_enable(state, intel_crtc);










@@ -7089,7 +7088,6 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,









	dev_priv->display.initial_watermarks(state, pipe_config);







	dev_priv->display.initial_watermarks(state, pipe_config);











	intel_enable_pipe(pipe_config);







	intel_enable_pipe(pipe_config);



























	assert_vblank_disabled(crtc);














	intel_crtc_vblank_on(pipe_config);







	intel_crtc_vblank_on(pipe_config);



























	intel_encoders_enable(state, intel_crtc);







	intel_encoders_enable(state, intel_crtc);










@@ -7149,7 +7147,6 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,









		intel_update_watermarks(intel_crtc);







		intel_update_watermarks(intel_crtc);











	intel_enable_pipe(pipe_config);







	intel_enable_pipe(pipe_config);



























	assert_vblank_disabled(crtc);














	intel_crtc_vblank_on(pipe_config);







	intel_crtc_vblank_on(pipe_config);



























	intel_encoders_enable(state, intel_crtc);







	intel_encoders_enable(state, intel_crtc);



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE