Hi 2012/9/6 Daniel Vetter <daniel.vetter at ffwll.ch>: > 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. > Ok, so I looked at BSpec and the conclusion is: shouldn't we do this for eDP _and_ DP instead of just eDP? The only things to disable before the crtc are audio, the panel backlight, and then the panel power. Your patch looks correct, but maybe it could be even more correct by including DP too? Yes, I can help testing. > 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. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44001 > Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch> > --- > drivers/gpu/drm/i915/intel_dp.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 07f9521..f28353d 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1315,15 +1315,20 @@ 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); > - intel_dp_link_down(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); > } > > 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) > -- > 1.7.11.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni
