Commit 13b77ac5 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to ALPM_CTL 



Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the ALPM_CTL register macro.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/96da9be36dc93fa9a7c329f25ff963e4998998c1.1714471597.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent db92d423

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

+2 −2
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp) 


	alpm_ctl |= ALPM_CTL_ALPM_ENTRY_CHECK(psr->alpm_parameters.check_entry_lines);



	intel_de_write(dev_priv, ALPM_CTL(cpu_transcoder), alpm_ctl);

	intel_de_write(dev_priv, ALPM_CTL(dev_priv, cpu_transcoder), alpm_ctl);

}



static void intel_psr_enable_source(struct intel_dp *intel_dp,
@@ -2112,7 +2112,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) 


	/* Panel Replay on eDP is always using ALPM aux less. */

	if (intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) {

		intel_de_rmw(dev_priv, ALPM_CTL(cpu_transcoder),

		intel_de_rmw(dev_priv, ALPM_CTL(dev_priv, cpu_transcoder),

			     ALPM_CTL_ALPM_ENABLE |

			     ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 
						  _SEL_FETCH_PLANE_BASE_1_A)



#define _ALPM_CTL_A	0x60950

#define ALPM_CTL(tran)	_MMIO_TRANS2(dev_priv, tran, _ALPM_CTL_A)

#define ALPM_CTL(dev_priv, tran)	_MMIO_TRANS2(dev_priv, tran, _ALPM_CTL_A)

#define  ALPM_CTL_ALPM_ENABLE				REG_BIT(31)

#define  ALPM_CTL_ALPM_AUX_LESS_ENABLE			REG_BIT(30)

#define  ALPM_CTL_LOBF_ENABLE				REG_BIT(29)