Commit 53b0deb4 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter

drm/i915/skl: Store the new WM state at the very end of the update

We're going to add a new step, let's not hide the copy of the new WM
state inside one inner function, but as a 1st level operation in the WM
update.

v2: Split the staging results structure to not exceed the 1Kb stack
    allocation in skl_update_wm()
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4f947386
...@@ -3463,8 +3463,6 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv, ...@@ -3463,8 +3463,6 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
new->ddb.cursor[pipe].start); new->ddb.cursor[pipe].start);
} }
} }
dev_priv->wm.skl_hw = *new;
} }
static bool skl_update_pipe_wm(struct drm_crtc *crtc, static bool skl_update_pipe_wm(struct drm_crtc *crtc,
...@@ -3558,6 +3556,9 @@ static void skl_update_wm(struct drm_crtc *crtc) ...@@ -3558,6 +3556,9 @@ static void skl_update_wm(struct drm_crtc *crtc)
skl_update_other_pipe_wm(dev, crtc, &config, results); skl_update_other_pipe_wm(dev, crtc, &config, results);
skl_write_wm_values(dev_priv, results); skl_write_wm_values(dev_priv, results);
/* store the new configuration */
dev_priv->wm.skl_hw = *results;
} }
static void static void
......
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