Commit 4c3cbdb1 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to EDP_PSR_AUX_DATA 



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

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static i915_reg_t psr_aux_data_reg(struct drm_i915_private *dev_priv, 
				   enum transcoder cpu_transcoder, int i)

{

	if (DISPLAY_VER(dev_priv) >= 8)

		return EDP_PSR_AUX_DATA(cpu_transcoder, i);

		return EDP_PSR_AUX_DATA(dev_priv, cpu_transcoder, i);

	else

		return HSW_SRD_AUX_DATA(i);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
#define HSW_SRD_AUX_DATA(i)			_MMIO(0x64814 + (i) * 4) /* 5 registers */

#define _SRD_AUX_DATA_A				0x60814

#define _SRD_AUX_DATA_EDP			0x6f814

#define EDP_PSR_AUX_DATA(tran, i)		_MMIO_TRANS2(dev_priv, tran, _SRD_AUX_DATA_A + (i) * 4) /* 5 registers */

#define EDP_PSR_AUX_DATA(dev_priv, tran, i)		_MMIO_TRANS2(dev_priv, tran, _SRD_AUX_DATA_A + (i) * 4) /* 5 registers */



#define HSW_SRD_STATUS				_MMIO(0x64840)

#define _SRD_STATUS_A				0x60840