Commit 30dee753 authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/psr: LunarLake PSR2_CTL[IO Wake Lines] is 6 bits wide 



On LunarLake  PSR2_CTL[IO Wake Lines] contains now bit 13:18. Take this
into account when enabling PSR2_CTL.

Bspec: 69885

Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240517073005.2414293-3-jouni.hogander@intel.com
parent 45430e7b

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

+2 −0
Original line number Diff line number Diff line
@@ -958,6 +958,8 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) 


		tmp = map[psr->alpm_parameters.fast_wake_lines - TGL_EDP_PSR2_FAST_WAKE_MIN_LINES];

		val |= TGL_EDP_PSR2_FAST_WAKE(tmp + TGL_EDP_PSR2_FAST_WAKE_MIN_LINES);

	} else if (DISPLAY_VER(dev_priv) >= 20) {

		val |= LNL_EDP_PSR2_IO_BUFFER_WAKE(psr->alpm_parameters.io_wake_lines);

	} else if (DISPLAY_VER(dev_priv) >= 12) {

		val |= TGL_EDP_PSR2_IO_BUFFER_WAKE(psr->alpm_parameters.io_wake_lines);

		val |= TGL_EDP_PSR2_FAST_WAKE(psr->alpm_parameters.fast_wake_lines);

drivers/gpu/drm/i915/display/intel_psr_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ 
#define   TGL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES	5

#define   TGL_EDP_PSR2_IO_BUFFER_WAKE(lines)	REG_FIELD_PREP(TGL_EDP_PSR2_IO_BUFFER_WAKE_MASK, \

							       (lines) - TGL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES)

#define   LNL_EDP_PSR2_IO_BUFFER_WAKE_MASK	REG_GENMASK(18, 13)

#define   LNL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES	5

#define   LNL_EDP_PSR2_IO_BUFFER_WAKE(lines)	REG_FIELD_PREP(LNL_EDP_PSR2_IO_BUFFER_WAKE_MASK, \

							       (lines) - LNL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES)

#define   EDP_PSR2_FAST_WAKE_MASK		REG_GENMASK(12, 11)

#define   EDP_PSR2_FAST_WAKE_MAX_LINES		8

#define   EDP_PSR2_FAST_WAKE(lines)		REG_FIELD_PREP(EDP_PSR2_FAST_WAKE_MASK, \