diff options
author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2018-11-09 09:09:23 -0500 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-11-14 06:17:45 -0500 |
commit | a22612301ae61d78a7c0c82dc556931a35db0e91 (patch) | |
tree | 2d02e906e6cf1895763107e301ad9108238556c0 | |
parent | 6a67a20366f894c172734f28c5646bdbe48a46e3 (diff) |
drm/i915/icl: Drop spurious register read from icl_dbuf_slices_update
Register DBUF_CTL_S2 is read and it's value is not used. As
there is no explanation why we should prime the hardware with
read, remove it as spurious.
Fixes: aa9664ffe863 ("drm/i915/icl: Enable 2nd DBuf slice only when needed")
Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181109140924.2663-1-mika.kuoppala@linux.intel.com
(cherry picked from commit 8577c319b6511fbc391f3775225fecd8b979bc26)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 0a4990d8843c..44e4491a4918 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c | |||
@@ -3176,8 +3176,7 @@ static u8 intel_dbuf_max_slices(struct drm_i915_private *dev_priv) | |||
3176 | void icl_dbuf_slices_update(struct drm_i915_private *dev_priv, | 3176 | void icl_dbuf_slices_update(struct drm_i915_private *dev_priv, |
3177 | u8 req_slices) | 3177 | u8 req_slices) |
3178 | { | 3178 | { |
3179 | u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices; | 3179 | const u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices; |
3180 | u32 val; | ||
3181 | bool ret; | 3180 | bool ret; |
3182 | 3181 | ||
3183 | if (req_slices > intel_dbuf_max_slices(dev_priv)) { | 3182 | if (req_slices > intel_dbuf_max_slices(dev_priv)) { |
@@ -3188,7 +3187,6 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv, | |||
3188 | if (req_slices == hw_enabled_slices || req_slices == 0) | 3187 | if (req_slices == hw_enabled_slices || req_slices == 0) |
3189 | return; | 3188 | return; |
3190 | 3189 | ||
3191 | val = I915_READ(DBUF_CTL_S2); | ||
3192 | if (req_slices > hw_enabled_slices) | 3190 | if (req_slices > hw_enabled_slices) |
3193 | ret = intel_dbuf_slice_set(dev_priv, DBUF_CTL_S2, true); | 3191 | ret = intel_dbuf_slice_set(dev_priv, DBUF_CTL_S2, true); |
3194 | else | 3192 | else |