Re: [Intel-gfx] [PATCH 3/4] drm/i915: fix Haswell FDI link disable path

2012-11-02 Thread Daniel Vetter 
On Thu, Nov 01, 2012 at 09:05:05PM -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni 
> 
> This covers the "Disable FDI" section from the CRT mode set sequence.
> This disables the FDI receiver and also the FDI pll.
> 
> Signed-off-by: Paulo Zanoni 

Ok, slurped in patches 1-3 (since patch 4 is already applied) of this
series, with a minor bikeshed on patch 2.

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 3/4] drm/i915: fix Haswell FDI link disable path

2012-11-01 Thread Paulo Zanoni 
From: Paulo Zanoni 

This covers the "Disable FDI" section from the CRT mode set sequence.
This disables the FDI receiver and also the FDI pll.

Signed-off-by: Paulo Zanoni 
---
 drivers/gpu/drm/i915/intel_ddi.c | 26 ++
 drivers/gpu/drm/i915/intel_display.c |  3 +--
 drivers/gpu/drm/i915/intel_drv.h |  4 +++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 92c2d61..38bc79d 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1364,6 +1364,32 @@ void intel_ddi_prepare_link_retrain(struct drm_encoder 
*encoder)
udelay(600);
 }
 
+void intel_ddi_fdi_disable(struct drm_crtc *crtc)
+{
+   struct drm_i915_private *dev_priv = crtc->dev->dev_private;
+   struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
+   uint32_t val;
+
+   intel_ddi_post_disable(intel_encoder);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_RX_ENABLE;
+   I915_WRITE(_FDI_RXA_CTL, val);
+
+   val = I915_READ(_FDI_RXA_MISC);
+   val &= ~(FDI_RX_PWRDN_LANE1_MASK | FDI_RX_PWRDN_LANE0_MASK);
+   val |= FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2);
+   I915_WRITE(_FDI_RXA_MISC, val);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_PCDCLK;
+   I915_WRITE(_FDI_RXA_CTL, val);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_RX_PLL_ENABLE;
+   I915_WRITE(_FDI_RXA_CTL, val);
+}
+
 static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
 {
struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 58911bd..8fbfc731f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3632,9 +3632,8 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
encoder->post_disable(encoder);
 
if (is_pch_port) {
-   ironlake_fdi_disable(crtc);
lpt_disable_pch_transcoder(dev_priv);
-   ironlake_fdi_pll_disable(intel_crtc);
+   intel_ddi_fdi_disable(crtc);
}
 
intel_crtc->active = false;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 08238ef..bcc5241 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -662,6 +662,8 @@ extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc, 
int clock);
 extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc);
 extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
 extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);
-bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
+extern bool
+intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
+extern void intel_ddi_fdi_disable(struct drm_crtc *crtc);
 
 #endif /* __INTEL_DRV_H__ */
-- 
1.7.11.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 3/4] drm/i915: fix Haswell FDI link disable path

2012-11-01 Thread Paulo Zanoni 
From: Paulo Zanoni 

This covers the "Disable FDI" section from the CRT mode set sequence.
This disables the FDI receiver and also the FDI pll.

Signed-off-by: Paulo Zanoni 
---
 drivers/gpu/drm/i915/intel_ddi.c | 26 ++
 drivers/gpu/drm/i915/intel_display.c |  3 +--
 drivers/gpu/drm/i915/intel_drv.h |  4 +++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 92c2d61..38bc79d 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1364,6 +1364,32 @@ void intel_ddi_prepare_link_retrain(struct drm_encoder 
*encoder)
udelay(600);
 }
 
+void intel_ddi_fdi_disable(struct drm_crtc *crtc)
+{
+   struct drm_i915_private *dev_priv = crtc->dev->dev_private;
+   struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc);
+   uint32_t val;
+
+   intel_ddi_post_disable(intel_encoder);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_RX_ENABLE;
+   I915_WRITE(_FDI_RXA_CTL, val);
+
+   val = I915_READ(_FDI_RXA_MISC);
+   val &= ~(FDI_RX_PWRDN_LANE1_MASK | FDI_RX_PWRDN_LANE0_MASK);
+   val |= FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2);
+   I915_WRITE(_FDI_RXA_MISC, val);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_PCDCLK;
+   I915_WRITE(_FDI_RXA_CTL, val);
+
+   val = I915_READ(_FDI_RXA_CTL);
+   val &= ~FDI_RX_PLL_ENABLE;
+   I915_WRITE(_FDI_RXA_CTL, val);
+}
+
 static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
 {
struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 69ed903..276a1c4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3619,10 +3619,9 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
encoder->post_disable(encoder);
 
if (is_pch_port) {
-   ironlake_fdi_disable(crtc);
lpt_disable_pch_transcoder(dev_priv, pipe);
intel_disable_pch_pll(intel_crtc);
-   ironlake_fdi_pll_disable(intel_crtc);
+   intel_ddi_fdi_disable(crtc);
}
 
intel_crtc->active = false;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 08238ef..bcc5241 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -662,6 +662,8 @@ extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc, 
int clock);
 extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc);
 extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
 extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);
-bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
+extern bool
+intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
+extern void intel_ddi_fdi_disable(struct drm_crtc *crtc);
 
 #endif /* __INTEL_DRV_H__ */
-- 
1.7.11.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx