]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/skl: Reduce the indentation level in skl_write_wm_values()
authorDamien Lespiau <damien.lespiau@intel.com>
Tue, 4 Nov 2014 17:07:00 +0000 (17:07 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 7 Nov 2014 17:42:13 +0000 (18:42 +0100)
We can reduce the indentation level by continuing early.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

index 176e9ef9b2668ec2813f57d0e305a331e6968b2b..7fdccba93385504bd8c56eef265b994ffdbfb0a8 100644 (file)
@@ -3485,30 +3485,30 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
                int i, level, max_level = ilk_wm_max_level(dev);
                enum pipe pipe = crtc->pipe;
 
-               if (new->dirty[pipe]) {
-                       I915_WRITE(PIPE_WM_LINETIME(pipe),
-                                       new->wm_linetime[pipe]);
-
-                       for (level = 0; level <= max_level; level++) {
-                               for (i = 0; i < intel_num_planes(crtc); i++)
-                                       I915_WRITE(PLANE_WM(pipe, i, level),
-                                               new->plane[pipe][i][level]);
-                               I915_WRITE(CUR_WM(pipe, level),
-                                       new->cursor[pipe][level]);
-                       }
-                       for (i = 0; i < intel_num_planes(crtc); i++)
-                               I915_WRITE(PLANE_WM_TRANS(pipe, i),
-                                               new->plane_trans[pipe][i]);
-                       I915_WRITE(CUR_WM_TRANS(pipe), new->cursor_trans[pipe]);
+               if (!new->dirty[pipe])
+                       continue;
 
-                       for (i = 0; i < intel_num_planes(crtc); i++)
-                               skl_ddb_entry_write(dev_priv,
-                                                   PLANE_BUF_CFG(pipe, i),
-                                                   &new->ddb.plane[pipe][i]);
+               I915_WRITE(PIPE_WM_LINETIME(pipe), new->wm_linetime[pipe]);
 
-                       skl_ddb_entry_write(dev_priv, CUR_BUF_CFG(pipe),
-                                           &new->ddb.cursor[pipe]);
+               for (level = 0; level <= max_level; level++) {
+                       for (i = 0; i < intel_num_planes(crtc); i++)
+                               I915_WRITE(PLANE_WM(pipe, i, level),
+                                          new->plane[pipe][i][level]);
+                       I915_WRITE(CUR_WM(pipe, level),
+                                  new->cursor[pipe][level]);
                }
+               for (i = 0; i < intel_num_planes(crtc); i++)
+                       I915_WRITE(PLANE_WM_TRANS(pipe, i),
+                                  new->plane_trans[pipe][i]);
+               I915_WRITE(CUR_WM_TRANS(pipe), new->cursor_trans[pipe]);
+
+               for (i = 0; i < intel_num_planes(crtc); i++)
+                       skl_ddb_entry_write(dev_priv,
+                                           PLANE_BUF_CFG(pipe, i),
+                                           &new->ddb.plane[pipe][i]);
+
+               skl_ddb_entry_write(dev_priv, CUR_BUF_CFG(pipe),
+                                   &new->ddb.cursor[pipe]);
        }
 }