From: Ville Syrjälä <[email protected]>

Move the vlv_program_pfi_credits() into vlv_set_cdclk() and
chv_set_cdclk() so that we can neuter vlv_modeset_commit_cdclk().

Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Ander Conselvan de Oliveira <[email protected]>
---
 drivers/gpu/drm/i915/intel_cdclk.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_cdclk.c 
b/drivers/gpu/drm/i915/intel_cdclk.c
index ad8969010c89..2a46c4d07546 100644
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@ -522,6 +522,8 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv,
 
        mutex_unlock(&dev_priv->sb_lock);
 
+       vlv_program_pfi_credits(dev_priv);
+
        intel_update_cdclk(dev_priv);
 }
 
@@ -561,6 +563,8 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv,
        }
        mutex_unlock(&dev_priv->rps.hw_lock);
 
+       vlv_program_pfi_credits(dev_priv);
+
        intel_update_cdclk(dev_priv);
 }
 
@@ -1500,7 +1504,6 @@ static void vlv_modeset_commit_cdclk(struct 
drm_atomic_state *old_state)
        else
                vlv_set_cdclk(dev_priv, &dev_priv->cdclk.actual);
 
-       vlv_program_pfi_credits(dev_priv);
 
        intel_display_power_put(dev_priv, POWER_DOMAIN_PIPE_A);
 }
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to