Commit 3fcb1cbd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2026-03-05' of... 

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

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patch.msgid.link/aakz17Jx3Ye9Vqci@jlahtine-mobl
parents 681d787c a99cac46

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

+8 −3
Original line number Diff line number Diff line
@@ -1307,9 +1307,14 @@ static bool psr2_granularity_check(struct intel_crtc_state *crtc_state, 
	u16 sink_y_granularity = crtc_state->has_panel_replay ?

		connector->dp.panel_replay_caps.su_y_granularity :

		connector->dp.psr_caps.su_y_granularity;

	u16 sink_w_granularity =  crtc_state->has_panel_replay ?

		connector->dp.panel_replay_caps.su_w_granularity :

		connector->dp.psr_caps.su_w_granularity;

	u16 sink_w_granularity;



	if (crtc_state->has_panel_replay)

		sink_w_granularity = connector->dp.panel_replay_caps.su_w_granularity ==

			DP_PANEL_REPLAY_FULL_LINE_GRANULARITY ?

			crtc_hdisplay : connector->dp.panel_replay_caps.su_w_granularity;

	else

		sink_w_granularity = connector->dp.psr_caps.su_w_granularity;



	/* PSR2 HW only send full lines so we only need to validate the width */

	if (crtc_hdisplay % sink_w_granularity)

include/drm/display/drm_dp.h

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,8 @@ 
# 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_FULL_LINE_GRANULARITY		0xffff



#define DP_PANEL_REPLAY_CAP_Y_GRANULARITY		0xb4



/* Link Configuration */