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

drm/i915: Move DRRS enable/disable higher up 



No reason to keep the DRRS enable/disable hidden insider the encoder
hooks. Let's just move them all the way up into platform independent
code so that all platforms get to use them. These are nops when
the state computation doesn't think DRRS is possible.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220311172428.14685-14-ville.syrjala@linux.intel.com
parent 851f15fe

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

+0 −3
Original line number Diff line number Diff line
@@ -2820,8 +2820,6 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state, 
	if (!dig_port->lspcon.active || dig_port->dp.has_hdmi_sink)

		intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);



	intel_drrs_enable(crtc_state);



	if (crtc_state->has_audio)

		intel_audio_codec_enable(encoder, crtc_state, conn_state);
@@ -2963,7 +2961,6 @@ static void intel_disable_ddi_dp(struct intel_atomic_state *state, 
		intel_audio_codec_disable(encoder,

					  old_crtc_state, old_conn_state);



	intel_drrs_disable(old_crtc_state);

	intel_psr_disable(intel_dp, old_crtc_state);

	intel_edp_backlight_off(old_conn_state);

	/* Disable the decompression in DP Sink */

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

+4 −0
Original line number Diff line number Diff line
@@ -8114,6 +8114,8 @@ static void intel_enable_crtc(struct intel_atomic_state *state, 
	if (intel_crtc_is_bigjoiner_slave(new_crtc_state))

		return;



	intel_drrs_enable(new_crtc_state);



	/* vblanks work again, re-enable pipe CRC. */

	intel_crtc_enable_pipe_crc(crtc);

}
@@ -8183,6 +8185,8 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state, 
	 */

	intel_crtc_disable_pipe_crc(crtc);



	intel_drrs_disable(old_crtc_state);



	dev_priv->display->crtc_disable(state, crtc);

	crtc->active = false;

	intel_fbc_disable(crtc);