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

Commit 563d22a0 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Move aux_ch to intel_digital_port 



From ICL onwards all DDI/TypeC ports - even working in HDMI mode - need
to know their corresponding AUX CH, so move the field to a common
struct.

No functional change.

v3:
- Add code comment about which ports aux_ch is used for. (Jose)

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181101140427.31026-3-imre.deak@intel.com
parent 15d248ae

drivers/gpu/drm/i915/intel_ddi.c

+3 −1
Original line number Diff line number Diff line
@@ -2084,6 +2084,8 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, 
static inline enum intel_display_power_domain

intel_ddi_main_link_aux_domain(struct intel_dp *intel_dp)

{

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);



	/* CNL+ HW requires corresponding AUX IOs to be powered up for PSR with

	 * DC states enabled at the same time, while for driver initiated AUX

	 * transfers we need the same AUX IOs to be powered but with DC states
@@ -2096,7 +2098,7 @@ intel_ddi_main_link_aux_domain(struct intel_dp *intel_dp) 
	 * Note that PSR is enabled only on Port A even though this function

	 * returns the correct domain for other ports too.

	 */

	return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A :

	return dig_port->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A :

					      intel_dp->aux_power_domain;

}

drivers/gpu/drm/i915/intel_dp.c

+23 −12
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ static uint32_t g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index) 
static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);



	if (index)

		return 0;
@@ -1213,7 +1214,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index) 
	 * like to run at 2MHz.  So, take the cdclk or PCH rawclk value and

	 * divide by 2000 and use that

	 */

	if (intel_dp->aux_ch == AUX_CH_A)

	if (dig_port->aux_ch == AUX_CH_A)

		return DIV_ROUND_CLOSEST(dev_priv->cdclk.hw.cdclk, 2000);

	else

		return DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 2000);
@@ -1222,8 +1223,9 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index) 
static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);



	if (intel_dp->aux_ch != AUX_CH_A && HAS_PCH_LPT_H(dev_priv)) {

	if (dig_port->aux_ch != AUX_CH_A && HAS_PCH_LPT_H(dev_priv)) {

		/* Workaround for non-ULT HSW */

		switch (index) {

		case 0: return 63;
@@ -1554,7 +1556,9 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
static enum intel_display_power_domain

intel_aux_power_domain(struct intel_dp *intel_dp)

{

	switch (intel_dp->aux_ch) {

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);



	switch (dig_port->aux_ch) {

	case AUX_CH_A:

		return POWER_DOMAIN_AUX_A;

	case AUX_CH_B:
@@ -1568,7 +1572,7 @@ intel_aux_power_domain(struct intel_dp *intel_dp) 
	case AUX_CH_F:

		return POWER_DOMAIN_AUX_F;

	default:

		MISSING_CASE(intel_dp->aux_ch);

		MISSING_CASE(dig_port->aux_ch);

		return POWER_DOMAIN_AUX_A;

	}

}
@@ -1576,7 +1580,8 @@ intel_aux_power_domain(struct intel_dp *intel_dp) 
static i915_reg_t g4x_aux_ctl_reg(struct intel_dp *intel_dp)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_B:
@@ -1592,7 +1597,8 @@ static i915_reg_t g4x_aux_ctl_reg(struct intel_dp *intel_dp) 
static i915_reg_t g4x_aux_data_reg(struct intel_dp *intel_dp, int index)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_B:
@@ -1608,7 +1614,8 @@ static i915_reg_t g4x_aux_data_reg(struct intel_dp *intel_dp, int index) 
static i915_reg_t ilk_aux_ctl_reg(struct intel_dp *intel_dp)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_A:
@@ -1626,7 +1633,8 @@ static i915_reg_t ilk_aux_ctl_reg(struct intel_dp *intel_dp) 
static i915_reg_t ilk_aux_data_reg(struct intel_dp *intel_dp, int index)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_A:
@@ -1644,7 +1652,8 @@ static i915_reg_t ilk_aux_data_reg(struct intel_dp *intel_dp, int index) 
static i915_reg_t skl_aux_ctl_reg(struct intel_dp *intel_dp)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_A:
@@ -1663,7 +1672,8 @@ static i915_reg_t skl_aux_ctl_reg(struct intel_dp *intel_dp) 
static i915_reg_t skl_aux_data_reg(struct intel_dp *intel_dp, int index)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	enum aux_ch aux_ch = intel_dp->aux_ch;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum aux_ch aux_ch = dig_port->aux_ch;



	switch (aux_ch) {

	case AUX_CH_A:
@@ -1689,9 +1699,10 @@ static void 
intel_dp_aux_init(struct intel_dp *intel_dp)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);

	struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct intel_encoder *encoder = &dig_port->base;



	intel_dp->aux_ch = intel_aux_ch(dev_priv, encoder->port);

	dig_port->aux_ch = intel_aux_ch(dev_priv, encoder->port);

	intel_dp->aux_power_domain = intel_aux_power_domain(intel_dp);



	if (INTEL_GEN(dev_priv) >= 9) {

drivers/gpu/drm/i915/intel_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,6 @@ struct intel_dp { 
	bool link_trained;

	bool has_audio;

	bool reset_link_params;

	enum aux_ch aux_ch;

	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];

	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];

	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -1214,6 +1213,8 @@ struct intel_digital_port { 
	enum irqreturn (*hpd_pulse)(struct intel_digital_port *, bool);

	bool release_cl2_override;

	uint8_t max_lanes;

	/* Used for DP and ICL+ TypeC/DP and TypeC/HDMI ports. */

	enum aux_ch aux_ch;

	enum intel_display_power_domain ddi_io_power_domain;

	enum tc_port_type tc_type;