Commit a0d1cfa8 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to PSR2_SU_STATUS 



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

v2: Expand from _PSR2_SU_STATUS to PSR2_SU_STATUS (Rodrigo)

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


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

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

+2 −1
Original line number Diff line number Diff line
@@ -3569,7 +3569,8 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) 
		 * frame boundary between register reads

		 */

		for (frame = 0; frame < PSR2_SU_STATUS_FRAMES; frame += 3) {

			val = intel_de_read(dev_priv, PSR2_SU_STATUS(cpu_transcoder, frame));

			val = intel_de_read(dev_priv,

					    PSR2_SU_STATUS(dev_priv, cpu_transcoder, frame));

			su_frames_val[frame / 3] = val;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ 


#define _PSR2_SU_STATUS_A		0x60914

#define _PSR2_SU_STATUS_EDP		0x6f914

#define _PSR2_SU_STATUS(tran, index)	_MMIO_TRANS2(dev_priv, tran, _PSR2_SU_STATUS_A + (index) * 4)

#define PSR2_SU_STATUS(tran, frame)	(_PSR2_SU_STATUS(tran, (frame) / 3))

#define _PSR2_SU_STATUS(dev_priv, tran, index)	_MMIO_TRANS2(dev_priv, tran, _PSR2_SU_STATUS_A + (index) * 4)

#define PSR2_SU_STATUS(dev_priv, tran, frame)	(_PSR2_SU_STATUS(dev_priv, tran, (frame) / 3))

#define PSR2_SU_STATUS_SHIFT(frame)	(((frame) % 3) * 10)

#define PSR2_SU_STATUS_MASK(frame)	(0x3ff << PSR2_SU_STATUS_SHIFT(frame))

#define PSR2_SU_STATUS_FRAMES		8