|
@@ -3198,9 +3198,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
|
|
|
|
|
|
intel_update_watermarks(dev);
|
|
|
|
|
|
- for_each_encoder_on_crtc(dev, crtc, encoder)
|
|
|
+ for_each_encoder_on_crtc(dev, crtc, encoder) {
|
|
|
if (encoder->pre_pll_enable)
|
|
|
encoder->pre_pll_enable(encoder);
|
|
|
+ if (encoder->pre_enable)
|
|
|
+ encoder->pre_enable(encoder);
|
|
|
+ }
|
|
|
|
|
|
if (intel_crtc->config.has_pch_encoder) {
|
|
|
/* Note: FDI PLL enabling _must_ be done before we enable the
|
|
@@ -3212,10 +3215,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
|
|
|
assert_fdi_rx_disabled(dev_priv, pipe);
|
|
|
}
|
|
|
|
|
|
- for_each_encoder_on_crtc(dev, crtc, encoder)
|
|
|
- if (encoder->pre_enable)
|
|
|
- encoder->pre_enable(encoder);
|
|
|
-
|
|
|
ironlake_pfit_enable(intel_crtc);
|
|
|
|
|
|
/*
|