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

drm/i915: Pass old crtc state to intel_crtc_vblank_off() 



To make life easier in the future let's pass the old crtc state
to intel_crtc_vblank_off() just like we already do for its
counterpart intel_crtc_vblank_on().

Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Manasi 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/20191213195217.15168-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent cfb627c4

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

+6 −4
Original line number Diff line number Diff line
@@ -1823,8 +1823,10 @@ static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state) 
	drm_crtc_vblank_on(&crtc->base);

}



static void intel_crtc_vblank_off(struct intel_crtc *crtc)

static void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state)

{

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



	drm_crtc_vblank_off(&crtc->base);

	assert_vblank_disabled(&crtc->base);

}
@@ -6697,7 +6699,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state, 


	intel_encoders_disable(state, crtc);



	intel_crtc_vblank_off(crtc);

	intel_crtc_vblank_off(old_crtc_state);



	intel_disable_pipe(old_crtc_state);
@@ -6746,7 +6748,7 @@ static void haswell_crtc_disable(struct intel_atomic_state *state, 


	intel_encoders_disable(state, crtc);



	intel_crtc_vblank_off(crtc);

	intel_crtc_vblank_off(old_crtc_state);



	/* XXX: Do the pipe assertions at the right place for BXT DSI. */

	if (!transcoder_is_dsi(cpu_transcoder))
@@ -7111,7 +7113,7 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, 


	intel_encoders_disable(state, crtc);



	intel_crtc_vblank_off(crtc);

	intel_crtc_vblank_off(old_crtc_state);



	intel_disable_pipe(old_crtc_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE