History

Merge tag 'drm-intel-fixes-2026-03-05' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

- Fix for #7284: Lenovo T14 G7 display not refreshing

Dave Airlie committed 8 months ago

Commit 3fcb1cb2 parents 681d787 a99cac42 files · +10 −3Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/i915/display/intel_psr.c +8 −3
  2. include/drm/display/drm_dp.h +2 −0
drivers/gpu/drm/i915/display/intel_psr.c+8−3
@@ -1307,9 +1307,14 @@ static bool psr2_granularity_check(struct intel_crtc_state *crtc_state, · 1306 unmodified lines
13071307 u16 sink_y_granularity = crtc_state->has_panel_replay ?
13081308 connector->dp.panel_replay_caps.su_y_granularity :
13091309 connector->dp.psr_caps.su_y_granularity;
1310− u16 sink_w_granularity = crtc_state->has_panel_replay ?
1311− connector->dp.panel_replay_caps.su_w_granularity :
1312− connector->dp.psr_caps.su_w_granularity;
1310+ u16 sink_w_granularity;
1311+
1312+ if (crtc_state->has_panel_replay)
1313+ sink_w_granularity = connector->dp.panel_replay_caps.su_w_granularity ==
1314+ DP_PANEL_REPLAY_FULL_LINE_GRANULARITY ?
1315+ crtc_hdisplay : connector->dp.panel_replay_caps.su_w_granularity;
1316+ else
1317+ sink_w_granularity = connector->dp.psr_caps.su_w_granularity;
13131318
13141319 /* PSR2 HW only send full lines so we only need to validate the width */
13151320 if (crtc_hdisplay % sink_w_granularity)
include/drm/display/drm_dp.h+2−0
@@ -571,6 +571,8 @@ · 570 unmodified lines
571571 # define DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP (1 << 7)
572572
573573 #define DP_PANEL_REPLAY_CAP_X_GRANULARITY 0xb2
574+# define DP_PANEL_REPLAY_FULL_LINE_GRANULARITY 0xffff
575+
574576 #define DP_PANEL_REPLAY_CAP_Y_GRANULARITY 0xb4
575577
576578 /* Link Configuration */