Skip to content

Commit e8ae25d

Browse files
committed
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: Jani Nikula <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 851f15f commit e8ae25d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,8 +2820,6 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state,
28202820
if (!dig_port->lspcon.active || dig_port->dp.has_hdmi_sink)
28212821
intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
28222822

2823-
intel_drrs_enable(crtc_state);
2824-
28252823
if (crtc_state->has_audio)
28262824
intel_audio_codec_enable(encoder, crtc_state, conn_state);
28272825

@@ -2963,7 +2961,6 @@ static void intel_disable_ddi_dp(struct intel_atomic_state *state,
29632961
intel_audio_codec_disable(encoder,
29642962
old_crtc_state, old_conn_state);
29652963

2966-
intel_drrs_disable(old_crtc_state);
29672964
intel_psr_disable(intel_dp, old_crtc_state);
29682965
intel_edp_backlight_off(old_conn_state);
29692966
/* Disable the decompression in DP Sink */

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8114,6 +8114,8 @@ static void intel_enable_crtc(struct intel_atomic_state *state,
81148114
if (intel_crtc_is_bigjoiner_slave(new_crtc_state))
81158115
return;
81168116

8117+
intel_drrs_enable(new_crtc_state);
8118+
81178119
/* vblanks work again, re-enable pipe CRC. */
81188120
intel_crtc_enable_pipe_crc(crtc);
81198121
}
@@ -8183,6 +8185,8 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
81838185
*/
81848186
intel_crtc_disable_pipe_crc(crtc);
81858187

8188+
intel_drrs_disable(old_crtc_state);
8189+
81868190
dev_priv->display->crtc_disable(state, crtc);
81878191
crtc->active = false;
81888192
intel_fbc_disable(crtc);

0 commit comments

Comments
 (0)