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

Commit 5ca476f8 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: De-magic the PSR AUX message 



Use pack_aux() to construct the PSR exit DPMS D0 AUX message,
and use the defines from dp_dp_helper.h to populate the message
contents.

v2: Use sizeof() for message size (Jani)
    Use a generic loop to write EDP_PSR_AUX_DATA registers

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d8f2716a

drivers/gpu/drm/i915/i915_reg.h

+0 −2
Original line number Diff line number Diff line
@@ -2503,9 +2503,7 @@ enum punit_power_well { 


#define EDP_PSR_AUX_CTL(dev)			(EDP_PSR_BASE(dev) + 0x10)

#define EDP_PSR_AUX_DATA1(dev)			(EDP_PSR_BASE(dev) + 0x14)

#define   EDP_PSR_DPCD_COMMAND		0x80060000

#define EDP_PSR_AUX_DATA2(dev)			(EDP_PSR_BASE(dev) + 0x18)

#define   EDP_PSR_DPCD_NORMAL_OPERATION	(1<<24)

#define EDP_PSR_AUX_DATA3(dev)			(EDP_PSR_BASE(dev) + 0x1c)

#define EDP_PSR_AUX_DATA4(dev)			(EDP_PSR_BASE(dev) + 0x20)

#define EDP_PSR_AUX_DATA5(dev)			(EDP_PSR_BASE(dev) + 0x24)

drivers/gpu/drm/i915/intel_dp.c

+16 −5
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, 
}



static uint32_t

pack_aux(uint8_t *src, int src_bytes)

pack_aux(const uint8_t *src, int src_bytes)

{

	int	i;

	uint32_t v = 0;
@@ -2045,8 +2045,17 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t aux_clock_divider;

	int precharge = 0x3;

	int msg_size = 5;       /* Header(4) + Message(1) */

	bool only_standby = false;

	static const uint8_t aux_msg[] = {

		[0] = DP_AUX_NATIVE_WRITE << 4,

		[1] = DP_SET_POWER >> 8,

		[2] = DP_SET_POWER & 0xff,

		[3] = 1 - 1,

		[4] = DP_SET_POWER_D0,

	};

	int i;



	BUILD_BUG_ON(sizeof(aux_msg) > 20);



	aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, 0);
@@ -2062,11 +2071,13 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) 
				   DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);



	/* Setup AUX registers */

	I915_WRITE(EDP_PSR_AUX_DATA1(dev), EDP_PSR_DPCD_COMMAND);

	I915_WRITE(EDP_PSR_AUX_DATA2(dev), EDP_PSR_DPCD_NORMAL_OPERATION);

	for (i = 0; i < sizeof(aux_msg); i += 4)

		I915_WRITE(EDP_PSR_AUX_DATA1(dev) + i,

			   pack_aux(&aux_msg[i], sizeof(aux_msg) - i));



	I915_WRITE(EDP_PSR_AUX_CTL(dev),

		   DP_AUX_CH_CTL_TIME_OUT_400us |

		   (msg_size << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |

		   (sizeof(aux_msg) << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |

		   (precharge << DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT) |

		   (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT));

}