Re: [Intel-gfx] [PATCH 1/2] drm/i915: Set M2_N2 registers during mode set
On Mon, 7 Jul 2014 14:59:45 +0530
Vandana Kannan vandana.kan...@intel.com wrote:
For Gen 8, set M2_N2 registers on every mode set. This is required to make
sure M2_N2 registers are set during boot, resume from sleep for cross-
checking the state. The register is set only if DRRS is supported.
v2: Patch rebased
v3: Daniel's review comments
- Removed HAS_DRRS(dev) and added bool has_drrs to pipe_config to
track drrs support
Signed-off-by: Vandana Kannan vandana.kan...@intel.com
Cc: Daniel Vetter daniel.vet...@ffwll.ch
---
drivers/gpu/drm/i915/intel_display.c | 36
drivers/gpu/drm/i915/intel_dp.c | 16 ++--
drivers/gpu/drm/i915/intel_drv.h | 2 ++
3 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index a72b55f..22bdea5f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4020,8 +4020,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
if (intel_crtc-config.has_pch_encoder)
intel_prepare_shared_dpll(intel_crtc);
- if (intel_crtc-config.has_dp_encoder)
+ if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+ if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+ intel_dp_set_m2_n2(intel_crtc,
+ intel_crtc-config.dp_m2_n2);
+ }
intel_set_pipe_timings(intel_crtc);
@@ -4130,8 +4134,12 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
if (intel_crtc-active)
return;
- if (intel_crtc-config.has_dp_encoder)
+ if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+ if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+ intel_dp_set_m2_n2(intel_crtc,
+ intel_crtc-config.dp_m2_n2);
+ }
intel_set_pipe_timings(intel_crtc);
@@ -4648,8 +4656,12 @@ static void valleyview_crtc_enable(struct drm_crtc
*crtc)
/* Set up the display plane register */
dspcntr = DISPPLANE_GAMMA_ENABLE;
- if (intel_crtc-config.has_dp_encoder)
+ if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+ if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+ intel_dp_set_m2_n2(intel_crtc,
+ intel_crtc-config.dp_m2_n2);
+ }
intel_set_pipe_timings(intel_crtc);
@@ -4738,8 +4750,12 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
else
dspcntr |= DISPPLANE_SEL_PIPE_B;
- if (intel_crtc-config.has_dp_encoder)
+ if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+ if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+ intel_dp_set_m2_n2(intel_crtc,
+ intel_crtc-config.dp_m2_n2);
+ }
intel_set_pipe_timings(intel_crtc);
@@ -5530,6 +5546,18 @@ static void intel_dp_set_m_n(struct intel_crtc *crtc)
intel_cpu_transcoder_set_m_n(crtc, crtc-config.dp_m_n);
}
+void intel_dp_set_m2_n2(struct intel_crtc *crtc, struct intel_link_m_n *m_n)
+{
+ struct drm_device *dev = crtc-base.dev;
+ struct drm_i915_private *dev_priv = dev-dev_private;
+ enum transcoder transcoder = crtc-config.cpu_transcoder;
+
+ I915_WRITE(PIPE_DATA_M2(transcoder), TU_SIZE(m_n-tu) | m_n-gmch_m);
+ I915_WRITE(PIPE_DATA_N2(transcoder), m_n-gmch_n);
+ I915_WRITE(PIPE_LINK_M2(transcoder), m_n-link_m);
+ I915_WRITE(PIPE_LINK_N2(transcoder), m_n-link_n);
+}
+
static void vlv_update_pll(struct intel_crtc *crtc)
{
u32 dpll, dpll_md;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b5ec489..1c3960b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -780,20 +780,6 @@ intel_dp_set_clock(struct intel_encoder *encoder,
}
}
-static void
-intel_dp_set_m2_n2(struct intel_crtc *crtc, struct intel_link_m_n *m_n)
-{
- struct drm_device *dev = crtc-base.dev;
- struct drm_i915_private *dev_priv = dev-dev_private;
- enum transcoder transcoder = crtc-config.cpu_transcoder;
-
- I915_WRITE(PIPE_DATA_M2(transcoder),
- TU_SIZE(m_n-tu) | m_n-gmch_m);
- I915_WRITE(PIPE_DATA_N2(transcoder), m_n-gmch_n);
- I915_WRITE(PIPE_LINK_M2(transcoder), m_n-link_m);
- I915_WRITE(PIPE_LINK_N2(transcoder), m_n-link_n);
-}
-
bool
intel_dp_compute_config(struct intel_encoder *encoder,
struct intel_crtc_config *pipe_config)
@@ -819,6 +805,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
pipe_config-has_pch_encoder =
Re: [Intel-gfx] [PATCH 1/2] drm/i915: Set M2_N2 registers during mode set
On Jul-10-2014 2:42 AM, Jesse Barnes wrote:
On Mon, 7 Jul 2014 14:59:45 +0530
Vandana Kannan vandana.kan...@intel.com wrote:
For Gen 8, set M2_N2 registers on every mode set. This is required to make
sure M2_N2 registers are set during boot, resume from sleep for cross-
checking the state. The register is set only if DRRS is supported.
v2: Patch rebased
v3: Daniel's review comments
- Removed HAS_DRRS(dev) and added bool has_drrs to pipe_config to
track drrs support
Signed-off-by: Vandana Kannan vandana.kan...@intel.com
Cc: Daniel Vetter daniel.vet...@ffwll.ch
---
drivers/gpu/drm/i915/intel_display.c | 36
drivers/gpu/drm/i915/intel_dp.c | 16 ++--
drivers/gpu/drm/i915/intel_drv.h | 2 ++
3 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index a72b55f..22bdea5f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4020,8 +4020,12 @@ static void ironlake_crtc_enable(struct drm_crtc
*crtc)
if (intel_crtc-config.has_pch_encoder)
intel_prepare_shared_dpll(intel_crtc);
-if (intel_crtc-config.has_dp_encoder)
+if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+intel_dp_set_m2_n2(intel_crtc,
+intel_crtc-config.dp_m2_n2);
+}
intel_set_pipe_timings(intel_crtc);
@@ -4130,8 +4134,12 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
if (intel_crtc-active)
return;
-if (intel_crtc-config.has_dp_encoder)
+if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+intel_dp_set_m2_n2(intel_crtc,
+intel_crtc-config.dp_m2_n2);
+}
intel_set_pipe_timings(intel_crtc);
@@ -4648,8 +4656,12 @@ static void valleyview_crtc_enable(struct drm_crtc
*crtc)
/* Set up the display plane register */
dspcntr = DISPPLANE_GAMMA_ENABLE;
-if (intel_crtc-config.has_dp_encoder)
+if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+intel_dp_set_m2_n2(intel_crtc,
+intel_crtc-config.dp_m2_n2);
+}
intel_set_pipe_timings(intel_crtc);
@@ -4738,8 +4750,12 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
else
dspcntr |= DISPPLANE_SEL_PIPE_B;
-if (intel_crtc-config.has_dp_encoder)
+if (intel_crtc-config.has_dp_encoder) {
intel_dp_set_m_n(intel_crtc);
+if (INTEL_INFO(dev)-gen 8 intel_crtc-config.has_drrs)
+intel_dp_set_m2_n2(intel_crtc,
+intel_crtc-config.dp_m2_n2);
+}
intel_set_pipe_timings(intel_crtc);
@@ -5530,6 +5546,18 @@ static void intel_dp_set_m_n(struct intel_crtc *crtc)
intel_cpu_transcoder_set_m_n(crtc, crtc-config.dp_m_n);
}
+void intel_dp_set_m2_n2(struct intel_crtc *crtc, struct intel_link_m_n *m_n)
+{
+struct drm_device *dev = crtc-base.dev;
+struct drm_i915_private *dev_priv = dev-dev_private;
+enum transcoder transcoder = crtc-config.cpu_transcoder;
+
+I915_WRITE(PIPE_DATA_M2(transcoder), TU_SIZE(m_n-tu) | m_n-gmch_m);
+I915_WRITE(PIPE_DATA_N2(transcoder), m_n-gmch_n);
+I915_WRITE(PIPE_LINK_M2(transcoder), m_n-link_m);
+I915_WRITE(PIPE_LINK_N2(transcoder), m_n-link_n);
+}
+
static void vlv_update_pll(struct intel_crtc *crtc)
{
u32 dpll, dpll_md;
diff --git a/drivers/gpu/drm/i915/intel_dp.c
b/drivers/gpu/drm/i915/intel_dp.c
index b5ec489..1c3960b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -780,20 +780,6 @@ intel_dp_set_clock(struct intel_encoder *encoder,
}
}
-static void
-intel_dp_set_m2_n2(struct intel_crtc *crtc, struct intel_link_m_n *m_n)
-{
-struct drm_device *dev = crtc-base.dev;
-struct drm_i915_private *dev_priv = dev-dev_private;
-enum transcoder transcoder = crtc-config.cpu_transcoder;
-
-I915_WRITE(PIPE_DATA_M2(transcoder),
-TU_SIZE(m_n-tu) | m_n-gmch_m);
-I915_WRITE(PIPE_DATA_N2(transcoder), m_n-gmch_n);
-I915_WRITE(PIPE_LINK_M2(transcoder), m_n-link_m);
-I915_WRITE(PIPE_LINK_N2(transcoder), m_n-link_n);
-}
-
bool
intel_dp_compute_config(struct intel_encoder *encoder,
struct intel_crtc_config *pipe_config)
@@ -819,6 +805,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
pipe_config-has_pch_encoder = true;
