Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe36181b authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Rodrigo Vivi
Browse files

drm/i915/psr: Use PSR2 macro for PSR2 



Cosmetic change.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180328223046.16125-7-jose.souza@intel.com
parent 95f28d2e

drivers/gpu/drm/i915/i915_reg.h

+2 −1
Original line number Diff line number Diff line
@@ -4069,8 +4069,9 @@ enum { 
#define   EDP_PSR2_TP2_TIME_MASK	(3<<8)

#define   EDP_PSR2_FRAME_BEFORE_SU_SHIFT 4

#define   EDP_PSR2_FRAME_BEFORE_SU_MASK	(0xf<<4)

#define   EDP_PSR2_IDLE_MASK		0xf

#define   EDP_PSR2_FRAME_BEFORE_SU(a)	((a)<<4)

#define   EDP_PSR2_IDLE_FRAME_MASK	0xf

#define   EDP_PSR2_IDLE_FRAME_SHIFT	0



#define EDP_PSR2_STATUS			_MMIO(0x6f940)

#define EDP_PSR2_STATUS_STATE_MASK     (0xf<<28)

drivers/gpu/drm/i915/intel_psr.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) 
	uint32_t val;

	uint8_t sink_latency;



	val = idle_frames << EDP_PSR_IDLE_FRAME_SHIFT;

	val = idle_frames << EDP_PSR2_IDLE_FRAME_SHIFT;



	/* FIXME: selective update is probably totally broken because it doesn't

	 * mesh at all with our frontbuffer tracking. And the hw alone isn't