Commit da6ecc5d authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

drm/i915: don't use plane pipe select on VLV

Planes are fixed to pipes in VLV.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dca25cb8
...@@ -1267,7 +1267,7 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv, ...@@ -1267,7 +1267,7 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
int cur_pipe; int cur_pipe;
/* Planes are fixed to pipes on ILK+ */ /* Planes are fixed to pipes on ILK+ */
if (HAS_PCH_SPLIT(dev_priv->dev)) { if (HAS_PCH_SPLIT(dev_priv->dev) || IS_VALLEYVIEW(dev_priv->dev)) {
reg = DSPCNTR(pipe); reg = DSPCNTR(pipe);
val = I915_READ(reg); val = I915_READ(reg);
WARN((val & DISPLAY_PLANE_ENABLE), WARN((val & DISPLAY_PLANE_ENABLE),
...@@ -4743,10 +4743,12 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, ...@@ -4743,10 +4743,12 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
/* Set up the display plane register */ /* Set up the display plane register */
dspcntr = DISPPLANE_GAMMA_ENABLE; dspcntr = DISPPLANE_GAMMA_ENABLE;
if (pipe == 0) if (!IS_VALLEYVIEW(dev)) {
dspcntr &= ~DISPPLANE_SEL_PIPE_MASK; if (pipe == 0)
else dspcntr &= ~DISPPLANE_SEL_PIPE_MASK;
dspcntr |= DISPPLANE_SEL_PIPE_B; else
dspcntr |= DISPPLANE_SEL_PIPE_B;
}
if (pipe == 0 && INTEL_INFO(dev)->gen < 4) { if (pipe == 0 && INTEL_INFO(dev)->gen < 4) {
/* Enable pixel doubling when the dot clock is > 90% of the (display) /* Enable pixel doubling when the dot clock is > 90% of the (display)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment