Panel Replay + Adaptive sync
Subsystems (3)
v3 cover Panel Replay + Adaptive sync
This patch set is adding missing configuration to have Panel Replay and Adaptive Sync enabled simultaneously. Also some issues identified while debugging are fixed:
1. Source PORT ALPM configuration has to made during modeset.
2. PHY_CMN1_CONTROL is not written according to HAS document
3. Wrong register field definitions for PORT_ALPM_LFPS_CTL.
Patches are tested on LunarLake and PantheLake using our reference panel supporting Adaptive Sync and Panel Replay.
EMP_AS_SDP_TL is currently missing completely from drm-tip. There is a patch for that which is needed if testing these patches:
https://patchwork.freedesktop.org/series/148421/
Otherwise "PSR idle timeout" errors are seen while testing.
v3:
- comment about DP2.1 corrected as DP2.1a
- referring patch removed from commit message
v2:
- rework Panel Replay DPCD register definitions
- do not use hardcoded indices while accessing intel_dp->pr_dpcd
- ensure ALPM registers are not written on platform where they do not exist
- remove kerneldoc comments
Jouni Högander (12):
drm/panelreplay: Panel Replay capability DPCD register definitions drm/dp: Add Panel Replay capability bits from DP2.1 specification drm/i915/psr: Read all Panel Replay capability registers from DPCD drm/i915/alpm: Add PR_ALPM_CTL register definitions drm/i915/alpm: Write PR_ALPM_CTL register
drm/i915/psr: Add interface to check if AUXLess ALPM is needed by PSR drm/i915/alpm: Add new interface to check if AUXLess ALPM is used drm/i915/alpm: Move port alpm configuration drm/i915/display: Add PHY_CMN1_CONTROL register definitions drm/i915/display: Add function to configure LFPS sending drm/i915/psr: Fix using wrong mask in REG_FIELD_PREP drm/i915/psr: Do not disable Panel Replay in case VRR is enabled
drivers/gpu/drm/i915/display/intel_alpm.c | 72 +++++++++++++------ drivers/gpu/drm/i915/display/intel_alpm.h | 4 ++ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 32 +++++++++ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 3 + drivers/gpu/drm/i915/display/intel_ddi.c | 12 ++++ .../drm/i915/display/intel_display_types.h | 4 +- drivers/gpu/drm/i915/display/intel_psr.c | 44 +++++++----- drivers/gpu/drm/i915/display/intel_psr.h | 2 + drivers/gpu/drm/i915/display/intel_psr_regs.h | 14 +++- include/drm/display/drm_dp.h | 18 +++-- 11 files changed, 163 insertions(+), 44 deletions(-)
Signature · 1 line
2.43.0
PATCH v3 1/12 drm/panelreplay: Panel Replay capability DPCD register definitions
Add new definition for size of Panel Replay DPCD capability registers area. Rename existing definitions to group capability registers together.
--- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++---- include/drm/display/drm_dp.h | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +4 -4
@@ -516,7 +516,7 @@ static u8 intel_dp_get_su_capability(struct intel_dp *intel_dp)if (intel_dp->psr.sink_panel_replay_su_support)drm_dp_dpcd_readb (&intel_dp->aux, -DP_PANEL_PANEL_REPLAY_CAPABILITY , +DP_PANEL_REPLAY_CAP_CAPABILITY , &su_capability);else su_capability = intel_dp->psr_dpcd[1 ];
@@ -528,7 +528,7 @@ static unsigned int intel_dp_get_su_x_granularity_offset(struct intel_dp *intel_dp) {return intel_dp->psr.sink_panel_replay_su_support ? -DP_PANEL_PANEL_REPLAY_X_GRANULARITY : +DP_PANEL_REPLAY_CAP_X_GRANULARITY :DP_PSR2_SU_X_GRANULARITY ; }
@@ -536,7 +536,7 @@ static unsigned int intel_dp_get_su_y_granularity_offset(struct intel_dp *intel_dp) {return intel_dp->psr.sink_panel_replay_su_support ? -DP_PANEL_PANEL_REPLAY_Y_GRANULARITY : +DP_PANEL_REPLAY_CAP_Y_GRANULARITY :DP_PSR2_SU_Y_GRANULARITY ; }
@@ -676,7 +676,7 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp) {drm_dp_dpcd_read (&intel_dp->aux,DP_PSR_SUPPORT , intel_dp->psr_dpcd,sizeof (intel_dp->psr_dpcd)); -drm_dp_dpcd_readb (&intel_dp->aux,DP_PANEL_REPLAY_CAP , +drm_dp_dpcd_readb (&intel_dp->aux,DP_PANEL_REPLAY_CAP_SUPPORT , &intel_dp->pr_dpcd);if (intel_dp->pr_dpcd &DP_PANEL_REPLAY_SUPPORT )
include/drm/display/drm_dp.h +7 -5
@@ -547,16 +547,18 @@/* DFP Capability Extension */ #define DP_DFP_CAPABILITY_EXTENSION_SUPPORT 0x0a3/* 2.0 */ -#define DP_PANEL_REPLAY_CAP 0x0b0/* DP 2.0 */ +#define DP_PANEL_REPLAY_CAP_SUPPORT 0x0b0/* DP 2.0 */ # define DP_PANEL_REPLAY_SUPPORT (1 << 0)# define DP_PANEL_REPLAY_SU_SUPPORT (1 << 1)# define DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT (1 << 2)/* eDP 1.5 */ -#define DP_PANEL_PANEL_REPLAY_CAPABILITY 0xb1 -# define DP_PANEL_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +#define DP_PANEL_REPLAY_CAP_SIZE 7 -#define DP_PANEL_PANEL_REPLAY_X_GRANULARITY 0xb2 -#define DP_PANEL_PANEL_REPLAY_Y_GRANULARITY 0xb4 +#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 +# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) + +#define DP_PANEL_REPLAY_CAP_X_GRANULARITY 0xb2 +#define DP_PANEL_REPLAY_CAP_Y_GRANULARITY 0xb4/* Link Configuration */ #define DP_LINK_BW_SET 0x100
Signature · 1 line
2.43.0
PATCH v3 2/12 drm/dp: Add Panel Replay capability bits from DP2.1 specification
In reply to Jouni HöganderAdd PANEL REPLAY CAPABILITY register (0xb1) bits.
v2: comment about DP2.1 changed as DP2.1a
--- include/drm/display/drm_dp.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
include/drm/display/drm_dp.h +8 -2
@@ -554,8 +554,14 @@#define DP_PANEL_REPLAY_CAP_SIZE 7 -#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 -# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 +# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT 1/* DP 2.1a */ +# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASK (3 << 1) +# define DP_PANEL_REPLAY_ASYNC_VIDEO_TIMING_NOT_SUPPORTED_IN_PR (1 << 3) +# define DP_PANEL_REPLAY_DSC_CRC_OF_MULTIPLE_SUS_SUPPORTED (1 << 4) +# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_CAPABILITY_SUPPORTED (1 << 6) +# define DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP (1 << 7)#define DP_PANEL_REPLAY_CAP_X_GRANULARITY 0xb2#define DP_PANEL_REPLAY_CAP_Y_GRANULARITY 0xb4
Signature · 1 line
2.43.0
Re: [PATCH v3 02/12] drm/dp: Add Panel Replay capability bits from DP2.1 specification
Quoted 14 lines · Jouni Högander
Add PANEL REPLAY CAPABILITY register (
0xb1) bits.v2: comment about DP2.1 changed as DP2.1a
Signed-off-by Jouni Högander <[email protected]>--- include/drm/display/drm_dp.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)include/drm/display/drm_dp.h +0
-0
include/drm/display/drm_dp.h line 559
Quoted 8 lines
include/drm/display/drm_dp.h +3
-2@@ -554,8 +554,14 @@#define DP_PANEL_REPLAY_CAP_SIZE 7 -#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 -# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 +# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT 1/* DP 2.1a */ +# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASK (3 << 1)
Thanks for clarification about DP2.1 a.
IMHO if we are using the shift DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT1 then perhaps DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASK should be:
(3<<DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT)
Also the DSC decode capability can be the unshifted:
#defineDP_DSC_DECODE_CAPABILITY_IN_PR_SUPPORTED0x00 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_FULL_FRAME_ONLY0x01 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_NOT_SUPPORTED0x02 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_RESERVED0x03
We can use shifted macros too but imho, these would be easier to re-use.
Regards,
Ankit
Quoted 8 lines
include/drm/display/drm_dp.h +5
-0+# define DP_PANEL_REPLAY_ASYNC_VIDEO_TIMING_NOT_SUPPORTED_IN_PR (1 << 3) +# define DP_PANEL_REPLAY_DSC_CRC_OF_MULTIPLE_SUS_SUPPORTED (1 << 4) +# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_CAPABILITY_SUPPORTED (1 << 6) +# define DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP (1 << 7)#define DP_PANEL_REPLAY_CAP_X_GRANULARITY 0xb2#define DP_PANEL_REPLAY_CAP_Y_GRANULARITY 0xb4
Re: [PATCH v3 02/12] drm/dp: Add Panel Replay capability bits from DP2.1 specification
Quoted 39 lines · Ankit K
Quoted 21 lines · Jouni Högander
Add PANEL REPLAY CAPABILITY register (
0xb1) bits.v2: comment about DP2.1 changed as DP2.1a
Signed-off-by Jouni Högander <[email protected]>---
include/drm/display/drm_dp.h| 10 ++++++++--1 file changed, 8 insertions(+), 2 deletions(-)include/drm/display/drm_dp.h +0
-0@@ -554,8 +554,14 @@
#defineDP_PANEL_REPLAY_CAP_SIZE7include/drm/display/drm_dp.h +1
-2-#define DP_PANEL_REPLAY_CAP_CAPABILITY 0xb1 -# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED (1 << 5) +#defineQuoted 5 lines
DP_PANEL_REPLAY_CAP_CAPABILITY0xb1
+# defineDP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT1 /* DP 2.1a */
+# defineDP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASK(3 << 1)Thanks for clarification about DP2.1 a.
IMHO if we are using the shift
DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT1
then perhapsDP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASKshould be:
(3<<DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT)Also the DSC decode capability can be the unshifted:
Quoted 7 lines
#defineDP_DSC_DECODE_CAPABILITY_IN_PR_SUPPORTED0x00 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_FULL_FRAME_ONLY0x01 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_NOT_SUPPORTED0x02 #defineDP_DSC_DECODE_CAPABILITY_IN_PR_RESERVED0x03
We can use shifted macros too but imho, these would be easier to re- use.
Changed this as suggested here. Please re-check.
BR,
Jouni Högander
Quoted 21 lines
Regards,
AnkitQuoted 16 lines
+# define
DP_PANEL_REPLAY_ASYNC_VIDEO_TIMING_NOT_SUPPORTED_IN_PR(1
<< 3)
+# defineDP_PANEL_REPLAY_DSC_CRC_OF_MULTIPLE_SUS_SUPPORTED(1 << 4)
+# defineDP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED(1 << 5)
+# defineDP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_CAPABILITY_SUPPORTED(1 << 6) +# define DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP (1 << 7)
#defineDP_PANEL_REPLAY_CAP_X_GRANULARITY0xb2
#defineDP_PANEL_REPLAY_CAP_Y_GRANULARITY0xb4
PATCH v3 3/12 drm/i915/psr: Read all Panel Replay capability registers from DPCD
In reply to Jouni HöganderThere are several Panel Replay capability register in DPCD. Read them all for later use.
v2:
- avoid using hardcoded indices
- read all Panel Replay capability registers
--- .../drm/i915/display/intel_display_types.h | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 20 ++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +3 -1
@@ -1669,7 +1669,9 @@ struct intel_dp {bool use_max_params;u8 dpcd[DP_RECEIVER_CAP_SIZE ];u8 psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE ]; -u8 pr_dpcd; +u8 pr_dpcd[DP_PANEL_REPLAY_CAP_SIZE ]; +#define INTEL_PR_DPCD_INDEX (pr_dpcd_register) ((pr_dpcd_register) - DP_PANEL_REPLAY_CAP_SUPPORT) +u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ];u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE ];u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ];
drivers/gpu/drm/i915/display/intel_psr.c +13 -7
@@ -608,7 +608,8 @@ static void _panel_replay_init_dpcd(struct intel_dp *intel_dp)return ; } -if (!(intel_dp->pr_dpcd &DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT )) { +if (!(intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_SUPPORT )] & +DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT )) {drm_dbg_kms (display->drm,"Panel doesn't support early transport, eDP Panel Replay not possible\n" );return ;
@@ -617,7 +618,8 @@ static void _panel_replay_init_dpcd(struct intel_dp *intel_dp) intel_dp->psr.sink_panel_replay_support = true; -if (intel_dp->pr_dpcd &DP_PANEL_REPLAY_SU_SUPPORT ) +if (intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_SUPPORT )] & +DP_PANEL_REPLAY_SU_SUPPORT ) intel_dp->psr.sink_panel_replay_su_support = true; drm_dbg_kms(display->drm,
@@ -676,10 +678,12 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp) {drm_dp_dpcd_read (&intel_dp->aux,DP_PSR_SUPPORT , intel_dp->psr_dpcd,sizeof (intel_dp->psr_dpcd)); -drm_dp_dpcd_readb (&intel_dp->aux,DP_PANEL_REPLAY_CAP_SUPPORT , - &intel_dp->pr_dpcd); -if (intel_dp->pr_dpcd &DP_PANEL_REPLAY_SUPPORT ) +drm_dp_dpcd_read (&intel_dp->aux,DP_PANEL_REPLAY_CAP_SUPPORT , + &intel_dp->pr_dpcd,sizeof (intel_dp->pr_dpcd)); + +if (intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_SUPPORT )] & +DP_PANEL_REPLAY_SUPPORT )_panel_replay_init_dpcd (intel_dp);if (intel_dp->psr_dpcd[0 ])
@@ -736,7 +740,8 @@ static bool psr2_su_region_et_valid(struct intel_dp *intel_dp, bool panel_replayreturn false;return panel_replay ? - intel_dp->pr_dpcd &DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT : + intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_SUPPORT )] & +DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT : intel_dp->psr_dpcd[0 ] ==DP_PSR2_WITH_Y_COORD_ET_SUPPORTED &&psr2_su_region_et_global_enabled (intel_dp); }
@@ -3916,7 +3921,8 @@ static void intel_psr_sink_capability(struct intel_dp *intel_dp,seq_printf (m,", Panel Replay = %s" ,str_yes_no (psr->sink_panel_replay_support));seq_printf (m,", Panel Replay Selective Update = %s" ,str_yes_no (psr->sink_panel_replay_su_support)); -if (intel_dp->pr_dpcd &DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT ) +if (intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_SUPPORT )] & +DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT )seq_printf (m," (Early Transport)" );seq_printf (m,"\n" ); }
Signature · 1 line
2.43.0
PATCH v3 4/12 drm/i915/alpm: Add PR_ALPM_CTL register definitions
In reply to Jouni HöganderAdd PR_ALPM_CTL register definition and bits for it.
Bspec: 71014
--- drivers/gpu/drm/i915/display/intel_psr_regs.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/display/intel_psr_regs.h +10 -0
@@ -266,6 +266,16 @@#define _PIPE_SRCSZ_ERLY_TPT_B 0x71074#define PIPE_SRCSZ_ERLY_TPT (pipe) _MMIO_PIPE((pipe), _PIPE_SRCSZ_ERLY_TPT_A, _PIPE_SRCSZ_ERLY_TPT_B) +#define _PR_ALPM_CTL_A 0x60948 +#define PR_ALPM_CTL (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PR_ALPM_CTL_A) +#define PR_ALPM_CTL_ALLOW_LINK_OFF_BETWEEN_AS_SDP_AND_SU BIT(6) +#define PR_ALPM_CTL_RFB_UPDATE_CONTROL BIT(5) +#define PR_ALPM_CTL_AS_SDP_TRANSMISSION_IN_ACTIVE_DISABLE BIT(4) +#define PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_MASK REG_GENMASK(1, 0) +#define PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_T1_OR_T2 REG_FIELD_PREP(PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_MASK, 0) +#define PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_T1 REG_FIELD_PREP(PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_MASK, 1) +#define PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_T2 REG_FIELD_PREP(PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_MASK, 2) +#define _ALPM_CTL_A 0x60950#define ALPM_CTL (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _ALPM_CTL_A)#define ALPM_CTL_ALPM_ENABLE REG_BIT(31)
Signature · 1 line
2.43.0
PATCH v3 5/12 drm/i915/alpm: Write PR_ALPM_CTL register
In reply to Jouni HöganderPR_ALPM_CTL register contains configurations related to Adaptive sync sdp. Configure these if Adaptive Sync SDP is supported.
v2: avoid using hardcoded indices
Bspec: 71014
--- drivers/gpu/drm/i915/display/intel_alpm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/i915/display/intel_alpm.c +14 -0
@@ -348,6 +348,20 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS |ALPM_CTL_AUX_LESS_WAKE_TIME (intel_dp->alpm_parameters.aux_less_wake_lines); +if (intel_dp->as_sdp_supported) { +u32 pr_alpm_ctl =PR_ALPM_CTL_ADAPTIVE_SYNC_SDP_POSITION_T1 ; + +if (intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_CAPABILITY )] & +DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP ) + pr_alpm_ctl |=PR_ALPM_CTL_ALLOW_LINK_OFF_BETWEEN_AS_SDP_AND_SU ; +if (!(intel_dp->pr_dpcd[INTEL_PR_DPCD_INDEX (DP_PANEL_REPLAY_CAP_CAPABILITY )] & +DP_PANEL_REPLAY_ASYNC_VIDEO_TIMING_NOT_SUPPORTED_IN_PR )) + pr_alpm_ctl |=PR_ALPM_CTL_AS_SDP_TRANSMISSION_IN_ACTIVE_DISABLE ; + +intel_de_write (display,PR_ALPM_CTL (display, cpu_transcoder), + pr_alpm_ctl); + } + intel_de_write(display, PORT_ALPM_CTL(port), PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE |
Signature · 1 line
2.43.0
PATCH v3 6/12 drm/i915/psr: Add interface to check if AUXLess ALPM is needed by PSR
In reply to Jouni HöganderCurrently we spread ugly PSR details into ALPM code to check if AUXLess ALPM is needed. Prepare to hide these details to PSR code by adding new interface for checking if AUXLess ALPM is needed.
v2: remove kerneldoc comment
--- drivers/gpu/drm/i915/display/intel_psr.c | 6 ++++++ drivers/gpu/drm/i915/display/intel_psr.h | 2 ++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_psr.c +6 -0
@@ -4246,3 +4246,9 @@ bool intel_psr_needs_alpm(struct intel_dp *intel_dp, const struct intel_crtc_stareturn intel_dp_is_edp (intel_dp) && (crtc_state->has_sel_update || crtc_state->has_panel_replay); } + +bool intel_psr_needs_alpm_aux_less (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state) +{ +return intel_dp_is_edp (intel_dp) && crtc_state->has_panel_replay; +}
drivers/gpu/drm/i915/display/intel_psr.h +2 -0
@@ -77,5 +77,7 @@ int intel_psr_min_vblank_delay(const struct intel_crtc_state *crtc_state);void intel_psr_connector_debugfs_add (struct intel_connector *connector);void intel_psr_debugfs_register (struct intel_display *display);bool intel_psr_needs_alpm (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state); +bool intel_psr_needs_alpm_aux_less (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state);#endif /* __INTEL_PSR_H__ */
Signature · 1 line
2.43.0
PATCH v3 7/12 drm/i915/alpm: Add new interface to check if AUXLess ALPM is used
In reply to Jouni Höganderwe need to know if AUXLess ALPM is used when preparing for link training. Add new interface for this and use it in existing code where possible.
v2: remove kerneldoc comment
--- drivers/gpu/drm/i915/display/intel_alpm.c | 10 ++++++++-- drivers/gpu/drm/i915/display/intel_alpm.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_alpm.c +8 -2
@@ -26,6 +26,13 @@ bool intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp)return intel_dp->alpm_dpcd &DP_ALPM_AUX_LESS_CAP ; } +bool intel_alpm_is_alpm_aux_less (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state) +{ +return intel_psr_needs_alpm_aux_less (intel_dp, crtc_state) || + (crtc_state->has_lobf &&intel_alpm_aux_less_wake_supported (intel_dp)); +} +void intel_alpm_init (struct intel_dp *intel_dp) {u8 dpcd;
@@ -341,8 +348,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,* Panel Replay on eDP is always using ALPM aux less. I.e. no need to * check panel support at this point. */ -if ((crtc_state->has_panel_replay &&intel_dp_is_edp (intel_dp)) || - (crtc_state->has_lobf &&intel_alpm_aux_less_wake_supported (intel_dp))) { +if (intel_alpm_is_alpm_aux_less (intel_dp, crtc_state)) { alpm_ctl =ALPM_CTL_ALPM_ENABLE |ALPM_CTL_ALPM_AUX_LESS_ENABLE | ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS |
drivers/gpu/drm/i915/display/intel_alpm.h +2 -0
@@ -32,6 +32,8 @@ void intel_alpm_post_plane_update(struct intel_atomic_state *state,void intel_alpm_lobf_debugfs_add (struct intel_connector *connector);bool intel_alpm_aux_wake_supported (struct intel_dp *intel_dp);bool intel_alpm_aux_less_wake_supported (struct intel_dp *intel_dp); +bool intel_alpm_is_alpm_aux_less (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state);void intel_alpm_disable (struct intel_dp *intel_dp);bool intel_alpm_get_error (struct intel_dp *intel_dp);#endif
Signature · 1 line
2.43.0
PATCH v3 8/12 drm/i915/alpm: Move port alpm configuration
In reply to Jouni HöganderIt is specified in Bspec where port alpm configuration is supposed to be performed. Change accordingly.
v2:
- drop HAS reference
- ensure PORT_ALPM registers are not writen on older platform
Bspec: 68849
--- drivers/gpu/drm/i915/display/intel_alpm.c | 48 ++++++++++++-------- drivers/gpu/drm/i915/display/intel_alpm.h | 2 + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 6 +++ 4 files changed, 39 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_alpm.c +30 -18
@@ -336,7 +336,6 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp, {struct intel_display *display =to_intel_display (intel_dp);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -enum port port =dp_to_dig_port (intel_dp)->base.port;u32 alpm_ctl; if (DISPLAY_VER(display) < 20 || (!intel_psr_needs_alpm(intel_dp, crtc_state) &&
@@ -368,23 +367,6 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp, pr_alpm_ctl); } -intel_de_write (display, -PORT_ALPM_CTL (port), -PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE | -PORT_ALPM_CTL_MAX_PHY_SWING_SETUP (15 ) | -PORT_ALPM_CTL_MAX_PHY_SWING_HOLD (0 ) | -PORT_ALPM_CTL_SILENCE_PERIOD ( - intel_dp->alpm_parameters.silence_period_sym_clocks)); - -intel_de_write (display, -PORT_ALPM_LFPS_CTL (port), -PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT (10 ) | -PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION ( - intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) | -PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION ( - intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) | -PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION ( - intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms)); }else { alpm_ctl =ALPM_CTL_EXTENDED_FAST_WAKE_ENABLE |ALPM_CTL_EXTENDED_FAST_WAKE_TIME (intel_dp->alpm_parameters.fast_wake_lines);
@@ -408,6 +390,36 @@ void intel_alpm_configure(struct intel_dp *intel_dp, intel_dp->alpm_parameters.transcoder = crtc_state->cpu_transcoder; } +void intel_alpm_port_configure (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state) +{ +struct intel_display *display =to_intel_display (intel_dp); +enum port port =dp_to_dig_port (intel_dp)->base.port; +u32 alpm_ctl_val =0 , lfps_ctl_val =0 ; + +if (DISPLAY_VER (display) <20 ) +return ; + +if (intel_alpm_is_alpm_aux_less (intel_dp, crtc_state)) { + alpm_ctl_val =PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE | +PORT_ALPM_CTL_MAX_PHY_SWING_SETUP (15 ) | +PORT_ALPM_CTL_MAX_PHY_SWING_HOLD (0 ) | +PORT_ALPM_CTL_SILENCE_PERIOD ( + intel_dp->alpm_parameters.silence_period_sym_clocks); + lfps_ctl_val =PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT (10 ) | +PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION ( + intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) | +PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION ( + intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) | +PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION ( + intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms); + } + +intel_de_write (display,PORT_ALPM_CTL (port), alpm_ctl_val); + +intel_de_write (display,PORT_ALPM_LFPS_CTL (port), lfps_ctl_val); +} +void intel_alpm_pre_plane_update (struct intel_atomic_state *state,struct intel_crtc *crtc) {
drivers/gpu/drm/i915/display/intel_alpm.h +2 -0
@@ -27,6 +27,8 @@ void intel_alpm_enable_sink(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);void intel_alpm_pre_plane_update (struct intel_atomic_state *state,struct intel_crtc *crtc); +void intel_alpm_port_configure (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state);void intel_alpm_post_plane_update (struct intel_atomic_state *state,struct intel_crtc *crtc);void intel_alpm_lobf_debugfs_add (struct intel_connector *connector);
drivers/gpu/drm/i915/display/intel_cx0_phy.c +1 -0
@@ -10,6 +10,7 @@#include "i915_reg.h" #include "i915_utils.h" +#include "intel_alpm.h" #include "intel_cx0_phy.h" #include "intel_cx0_phy_regs.h" #include "intel_ddi.h"
drivers/gpu/drm/i915/display/intel_ddi.c +6 -0
@@ -3743,6 +3743,12 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp,intel_ddi_buf_enable (encoder, intel_dp->DP); intel_dp->DP |=DDI_BUF_CTL_ENABLE ; + +/* +* 6.k If AUX-Less ALPM is going to be enabled +* i. Configure PORT_ALPM_CTL and PORT_ALPM_LFPS_CTL here +*/ +intel_alpm_port_configure (intel_dp, crtc_state); } static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp,
Signature · 1 line
2.43.0
PATCH v3 9/12 drm/i915/display: Add PHY_CMN1_CONTROL register definitions
In reply to Jouni HöganderAdd PHY_CMN1_CONTROL register and its definitions to configure port LFPS sending.
Bspec: 68962
--- drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +3 -0
@@ -285,6 +285,9 @@#define PHY_CX0_TX_CONTROL (tx, control) (0x400 + ((tx) - 1) * 0x200 + (control))#define CONTROL2_DISABLE_SINGLE_TX REG_BIT(6) +#define PHY_CMN1_CONTROL (tx, control) (0x800 + ((tx) - 1) * 0x200 + (control)) +#define CONTROL0_MAC_TRANSMIT_LFPS REG_BIT(1) +/* C20 Registers */ #define PHY_C20_WR_ADDRESS_L 0xC02#define PHY_C20_WR_ADDRESS_H 0xC03
Signature · 1 line
2.43.0
PATCH v3 10/12 drm/i915/display: Add function to configure LFPS sending
In reply to Jouni HöganderAdd function to configre LFPS sending for Panel Replay according to link training sequence in HAS document.
This assumes we are using AUX Less always if it's supported by the sink and the source.
v2:
- drop HAS reference
- replay kerneldoc comment with a generic comment
- check display version in intel_lnl_mac_transmit_lfps
Bspec: 68849
--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 31 ++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 ++ drivers/gpu/drm/i915/display/intel_ddi.c | 8 ++++- 3 files changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_cx0_phy.c +31 -0
@@ -3225,6 +3225,37 @@ void intel_mtl_pll_enable(struct intel_encoder *encoder,intel_cx0pll_enable (encoder, crtc_state); } +/* +* According to HAS we need to enable MAC Transmitting LFPS in the "PHY Common +* Control 0" PIPE register in case of AUX Less ALPM is going to be used. This +* function is doing that and is called by link retrain sequence. +*/ +void intel_lnl_mac_transmit_lfps (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) +{ +struct intel_display *display =to_intel_display (encoder); +u8 owned_lane_mask =intel_cx0_get_owned_lane_mask (encoder); +bool enable =intel_alpm_is_alpm_aux_less (enc_to_intel_dp (encoder), + crtc_state); +int i; + +if (DISPLAY_VER (display) <20 ) +return ; + +for (i =0 ; i <4 ; i++) { +int tx = i %2 +1 ; +u8 lane_mask = i <2 ?INTEL_CX0_LANE0 :INTEL_CX0_LANE1 ; + +if (!(owned_lane_mask & lane_mask)) +continue ; + +intel_cx0_rmw (encoder, lane_mask,PHY_CMN1_CONTROL (tx,0 ), +CONTROL0_MAC_TRANSMIT_LFPS , + enable ?CONTROL0_MAC_TRANSMIT_LFPS :0 , +MB_WRITE_COMMITTED ); + } +} +static u8 cx0_power_control_disable_val (struct intel_encoder *encoder) {struct intel_display *display =to_intel_display (encoder);
drivers/gpu/drm/i915/display/intel_cx0_phy.h +2 -0
@@ -43,5 +43,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state);int intel_mtl_tbt_calc_port_clock (struct intel_encoder *encoder);void intel_cx0_pll_power_save_wa (struct intel_display *display); +void intel_lnl_mac_transmit_lfps (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);#endif /* __INTEL_CX0_PHY_H__ */
drivers/gpu/drm/i915/display/intel_ddi.c +7 -1
@@ -3745,10 +3745,16 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp, intel_dp->DP |=DDI_BUF_CTL_ENABLE ;/* -* 6.k If AUX-Less ALPM is going to be enabled +* 6.k If AUX-Less ALPM is going to be enabled: * i. Configure PORT_ALPM_CTL and PORT_ALPM_LFPS_CTL here */ intel_alpm_port_configure (intel_dp, crtc_state); + +/* +* ii. Enable MAC Transmits LFPS in the "PHY Common Control 0" PIPE +* register +*/ +intel_lnl_mac_transmit_lfps (encoder, crtc_state); } static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp,
Signature · 1 line
2.43.0
PATCH v3 11/12 drm/i915/psr: Fix using wrong mask in REG_FIELD_PREP
In reply to Jouni HöganderWrong mask is used in PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION and PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION.
--- drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_psr_regs.h +2 -2
@@ -335,8 +335,8 @@#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(20, 16)#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val)#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(12, 8) -#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) +#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION_MASK, val)#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(4, 0) -#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) +#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK, val)#endif /* __INTEL_PSR_REGS_H__ */
Signature · 1 line
2.43.0
PATCH v3 12/12 drm/i915/psr: Do not disable Panel Replay in case VRR is enabled
In reply to Jouni HöganderAllow Panel Replay with VRR. All VRR modes are supposed to work with Panel Replay.
Bspec: 68920, 68925
--- drivers/gpu/drm/i915/display/intel_psr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +6 -6
@@ -1579,6 +1579,12 @@ static bool _psr_compute_config(struct intel_dp *intel_dp,if (!CAN_PSR (intel_dp))return false; +/* +* Currently PSR doesn't work reliably with VRR enabled. +*/ +if (crtc_state->vrr.enable) +return false; + entry_setup_frames =intel_psr_entry_setup_frames (intel_dp, adjusted_mode);if (entry_setup_frames >=0 ) {
@@ -1696,12 +1702,6 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,return ; } -/* -* Currently PSR/PR doesn't work reliably with VRR enabled. -*/ -if (crtc_state->vrr.enable) -return ; - crtc_state->has_panel_replay =_panel_replay_compute_config (intel_dp, crtc_state, conn_state);
Signature · 1 line
2.43.0
Patchwork
CI✗ LGCI.VerificationFailed: failure for Panel Replay + Adaptive sync (rev3)
In reply to Jouni Högander== Series Details ==
== Series Details ==
Series: Panel Replay + Adaptive sync (rev3)
URL : https://patchwork.freedesktop.org/series/148540/
State : failure
== Summary ==
Exception occurred during validation, bailing out!