Commit 3739850b authored Sep 06, 2012 by Daniel Vetter

drm/i915: disable the cpu edp port after the cpu pipe



See bspec, Vol3 Part2, Section 1.1.3 "Display Mode Set Sequence". This
applies to all platforms where we currently support eDP on, i.e. ilk,
snb & ivb.

Without this change we fail to light up the eDP port on previously
unused crtcs (likely because something is stuck on the old pipe), and
we also fail to properly disable the old pipe (i.e. bit 30 in the
PIPECONF register is stuck as set until the next reboot).

v2: Rebased on top of the edp panel off sequence changes in 3.6-rc2.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44001


Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 0c33d8d7

drivers/gpu/drm/i915/intel_dp.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1315,6 +1315,9 @@ static void intel_disable_dp(struct intel_encoder *encoder)
		ironlake_edp_backlight_off(intel_dp);
		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
		ironlake_edp_panel_off(intel_dp);

		/* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */
		if (!is_cpu_edp(intel_dp))
		intel_dp_link_down(intel_dp);
		}

		@@ -1322,9 +1325,11 @@ static void intel_post_disable_dp(struct intel_encoder *encoder)
		{
		struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

		if (is_cpu_edp(intel_dp))
		if (is_cpu_edp(intel_dp)) {
		intel_dp_link_down(intel_dp);
		ironlake_edp_pll_off(intel_dp);
		}
		}

		static void intel_enable_dp(struct intel_encoder *encoder)
		{