Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 650554 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/gpu/drm/i915/intel_ddi.c (-10 / +2 lines)
Lines 2208-2215 static void intel_ddi_pre_enable_dp(stru Link Here
2208
		intel_prepare_dp_ddi_buffers(encoder);
2208
		intel_prepare_dp_ddi_buffers(encoder);
2209
2209
2210
	intel_ddi_init_dp_buf_reg(encoder);
2210
	intel_ddi_init_dp_buf_reg(encoder);
2211
	if (!is_mst)
2211
	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
2212
		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
2213
	intel_dp_start_link_train(intel_dp);
2212
	intel_dp_start_link_train(intel_dp);
2214
	if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
2213
	if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
2215
		intel_dp_stop_link_train(intel_dp);
2214
		intel_dp_stop_link_train(intel_dp);
Lines 2294-2313 static void intel_ddi_post_disable_dp(st Link Here
2294
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
2293
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
2295
	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
2294
	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
2296
	struct intel_dp *intel_dp = &dig_port->dp;
2295
	struct intel_dp *intel_dp = &dig_port->dp;
2297
	/*
2298
	 * old_crtc_state and old_conn_state are NULL when called from
2299
	 * DP_MST. The main connector associated with this port is never
2300
	 * bound to a crtc for MST.
2301
	 */
2302
	bool is_mst = !old_crtc_state;
2303
2296
2304
	/*
2297
	/*
2305
	 * Power down sink before disabling the port, otherwise we end
2298
	 * Power down sink before disabling the port, otherwise we end
2306
	 * up getting interrupts from the sink on detecting link loss.
2299
	 * up getting interrupts from the sink on detecting link loss.
2307
	 */
2300
	 */
2308
	if (!is_mst)
2309
		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
2310
2301
2302
	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
2311
	intel_disable_ddi_buf(encoder);
2303
	intel_disable_ddi_buf(encoder);
2312
2304
2313
	intel_edp_panel_vdd_on(intel_dp);
2305
	intel_edp_panel_vdd_on(intel_dp);

Return to bug 650554