drm/i915: Eliminate rmw from .update_primary_plane()

Move the entire DSPCNTR register setup into the .update_primary_plane()
functions. That's where it belongs anyway and it'll also help 830M which
has the extra problem that plane registers reads will return the value
latched at the last vblank, not the value that was last written.

Also move DSPPOS and DSPSIZE setup there.

v2: Don't move variable initialization to avoid churn later

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 32 insertions, 68 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 24295694e493..041fd76a2ded 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2388,12 +2388,26 @@ static void i9xx_update_primary_plane(struct drm_crtc *crtc,
         int plane = intel_crtc->plane;
         unsigned long linear_offset;
         u32 dspcntr;
-        u32 reg;
+        u32 reg = DSPCNTR(plane);
+
+        dspcntr = DISPPLANE_GAMMA_ENABLE;
+
+        if (intel_crtc->primary_enabled)
+                dspcntr |= DISPLAY_PLANE_ENABLE;
+
+        if (INTEL_INFO(dev)->gen < 4) {
+                if (intel_crtc->pipe == PIPE_B)
+                        dspcntr |= DISPPLANE_SEL_PIPE_B;
+
+                /* pipesrc and dspsize control the size that is scaled from,
+                 * which should always be the user's requested size.
+                 */
+                I915_WRITE(DSPSIZE(plane),
+                           ((intel_crtc->config.pipe_src_h - 1) << 16) |
+                           (intel_crtc->config.pipe_src_w - 1));
+                I915_WRITE(DSPPOS(plane), 0);
+        }
 
-        reg = DSPCNTR(plane);
-        dspcntr = I915_READ(reg);
-        /* Mask out pixel format bits in case we change it */
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
         switch (fb->pixel_format) {
         case DRM_FORMAT_C8:
                 dspcntr |= DISPPLANE_8BPP;
@@ -2425,12 +2439,9 @@ static void i9xx_update_primary_plane(struct drm_crtc *crtc,
                 BUG();
         }
 
-        if (INTEL_INFO(dev)->gen >= 4) {
-                if (obj->tiling_mode != I915_TILING_NONE)
-                        dspcntr |= DISPPLANE_TILED;
-                else
-                        dspcntr &= ~DISPPLANE_TILED;
-        }
+        if (INTEL_INFO(dev)->gen >= 4 &&
+            obj->tiling_mode != I915_TILING_NONE)
+                dspcntr |= DISPPLANE_TILED;
 
         if (IS_G4X(dev))
                 dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
@@ -2474,12 +2485,16 @@ static void ironlake_update_primary_plane(struct drm_crtc *crtc,
         int plane = intel_crtc->plane;
         unsigned long linear_offset;
         u32 dspcntr;
-        u32 reg;
+        u32 reg = DSPCNTR(plane);
+
+        dspcntr = DISPPLANE_GAMMA_ENABLE;
+
+        if (intel_crtc->primary_enabled)
+                dspcntr |= DISPLAY_PLANE_ENABLE;
+
+        if (IS_HASWELL(dev) || IS_BROADWELL(dev))
+                dspcntr |= DISPPLANE_PIPE_CSC_ENABLE;
 
-        reg = DSPCNTR(plane);
-        dspcntr = I915_READ(reg);
-        /* Mask out pixel format bits in case we change it */
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
         switch (fb->pixel_format) {
         case DRM_FORMAT_C8:
                 dspcntr |= DISPPLANE_8BPP;
@@ -2509,12 +2524,8 @@ static void ironlake_update_primary_plane(struct drm_crtc *crtc,
 
         if (obj->tiling_mode != I915_TILING_NONE)
                 dspcntr |= DISPPLANE_TILED;
-        else
-                dspcntr &= ~DISPPLANE_TILED;
 
-        if (IS_HASWELL(dev) || IS_BROADWELL(dev))
-                dspcntr &= ~DISPPLANE_TRICKLE_FEED_DISABLE;
-        else
+        if (!IS_HASWELL(dev) && !IS_BROADWELL(dev))
                 dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
 
         I915_WRITE(reg, dspcntr);
@@ -3936,7 +3947,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_encoder *encoder;
         int pipe = intel_crtc->pipe;
-        enum plane plane = intel_crtc->plane;
 
         WARN_ON(!crtc->enabled);
 
@@ -3958,10 +3968,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 
         ironlake_set_pipeconf(crtc);
 
-        /* Set up the display plane register */
-        I915_WRITE(DSPCNTR(plane), DISPPLANE_GAMMA_ENABLE);
-        POSTING_READ(DSPCNTR(plane));
-
         dev_priv->display.update_primary_plane(crtc, crtc->primary->fb,
                                                crtc->x, crtc->y);
 
@@ -4049,7 +4055,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_encoder *encoder;
         int pipe = intel_crtc->pipe;
-        enum plane plane = intel_crtc->plane;
 
         WARN_ON(!crtc->enabled);
 
@@ -4073,10 +4078,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 
         intel_set_pipe_csc(crtc);
 
-        /* Set up the display plane register */
-        I915_WRITE(DSPCNTR(plane), DISPPLANE_GAMMA_ENABLE | DISPPLANE_PIPE_CSC_ENABLE);
-        POSTING_READ(DSPCNTR(plane));
-
         dev_priv->display.update_primary_plane(crtc, crtc->primary->fb,
                                                crtc->x, crtc->y);
 
@@ -4632,9 +4633,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_encoder *encoder;
         int pipe = intel_crtc->pipe;
-        int plane = intel_crtc->plane;
         bool is_dsi;
-        u32 dspcntr;
 
         WARN_ON(!crtc->enabled);
 
@@ -4650,27 +4649,13 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
                         vlv_prepare_pll(intel_crtc);
         }
 
-        /* Set up the display plane register */
-        dspcntr = DISPPLANE_GAMMA_ENABLE;
-
         if (intel_crtc->config.has_dp_encoder)
                 intel_dp_set_m_n(intel_crtc);
 
         intel_set_pipe_timings(intel_crtc);
 
-        /* pipesrc and dspsize control the size that is scaled from,
-         * which should always be the user's requested size.
-         */
-        I915_WRITE(DSPSIZE(plane),
-                   ((intel_crtc->config.pipe_src_h - 1) << 16) |
-                   (intel_crtc->config.pipe_src_w - 1));
-        I915_WRITE(DSPPOS(plane), 0);
-
         i9xx_set_pipeconf(intel_crtc);
 
-        I915_WRITE(DSPCNTR(plane), dspcntr);
-        POSTING_READ(DSPCNTR(plane));
-
         dev_priv->display.update_primary_plane(crtc, crtc->primary->fb,
                                                crtc->x, crtc->y);
 
@@ -4725,8 +4710,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_encoder *encoder;
         int pipe = intel_crtc->pipe;
-        int plane = intel_crtc->plane;
-        u32 dspcntr;
 
         WARN_ON(!crtc->enabled);
 
@@ -4735,32 +4718,13 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
 
         i9xx_set_pll_dividers(intel_crtc);
 
-        /* Set up the display plane register */
-        dspcntr = DISPPLANE_GAMMA_ENABLE;
-
-        if (pipe == 0)
-                dspcntr &= ~DISPPLANE_SEL_PIPE_MASK;
-        else
-                dspcntr |= DISPPLANE_SEL_PIPE_B;
-
         if (intel_crtc->config.has_dp_encoder)
                 intel_dp_set_m_n(intel_crtc);
 
         intel_set_pipe_timings(intel_crtc);
 
-        /* pipesrc and dspsize control the size that is scaled from,
-         * which should always be the user's requested size.
-         */
-        I915_WRITE(DSPSIZE(plane),
-                   ((intel_crtc->config.pipe_src_h - 1) << 16) |
-                   (intel_crtc->config.pipe_src_w - 1));
-        I915_WRITE(DSPPOS(plane), 0);
-
         i9xx_set_pipeconf(intel_crtc);
 
-        I915_WRITE(DSPCNTR(plane), dspcntr);
-        POSTING_READ(DSPCNTR(plane));
-
         dev_priv->display.update_primary_plane(crtc, crtc->primary->fb,
                                                crtc->x, crtc->y);