Commit 67322bec authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-11-06' of... 

Merge tag 'drm-intel-fixes-2019-11-06' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix HPD poll to avoid kworker consuming a lot of cpu cycles.
- Do not use TBT type for non Type-C ports.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191106213958.GA16525@intel.com
parents 72d74a06 ee2c5ef8

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

+7 −0
Original line number Diff line number Diff line
@@ -864,6 +864,13 @@ load_detect: 


out:

	intel_display_power_put(dev_priv, intel_encoder->power_domain, wakeref);



	/*

	 * Make sure the refs for power wells enabled during detect are

	 * dropped to avoid a new detect cycle triggered by HPD polling.

	 */

	intel_display_power_flush_work(dev_priv);



	return status;

}

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

+11 −1
Original line number Diff line number Diff line
@@ -1256,6 +1256,9 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, 
				u32 unused)

{

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *i915 =

			to_i915(intel_dig_port->base.base.dev);

	enum phy phy = intel_port_to_phy(i915, intel_dig_port->base.port);

	u32 ret;



	ret = DP_AUX_CH_CTL_SEND_BUSY |
@@ -1268,7 +1271,8 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, 
	      DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |

	      DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);



	if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)

	if (intel_phy_is_tc(i915, phy) &&

	    intel_dig_port->tc_mode == TC_PORT_TBT_ALT)

		ret |= DP_AUX_CH_CTL_TBT_IO;



	return ret;
@@ -5436,6 +5440,12 @@ out: 
	if (status != connector_status_connected && !intel_dp->is_mst)

		intel_dp_unset_edid(intel_dp);



	/*

	 * Make sure the refs for power wells enabled during detect are

	 * dropped to avoid a new detect cycle triggered by HPD polling.

	 */

	intel_display_power_flush_work(dev_priv);



	return status;

}

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

+6 −0
Original line number Diff line number Diff line
@@ -2565,6 +2565,12 @@ out: 
	if (status != connector_status_connected)

		cec_notifier_phys_addr_invalidate(intel_hdmi->cec_notifier);



	/*

	 * Make sure the refs for power wells enabled during detect are

	 * dropped to avoid a new detect cycle triggered by HPD polling.

	 */

	intel_display_power_flush_work(dev_priv);



	return status;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE