drm/i915: Nuke CACHE_MODE_0 save/restore

The CACHE_MODE_0 save/restore was added without explanation in
commit 1f84e550a870 ("drm/i915 more registers for S3 (DSPCLK_GATE_D,
CACHE_MODE_0, MI_ARB_STATE)"). If there are any bits we care about
those should be set explicitly during some appropriate init function.
Let's assume it's all good and just nuke this magic save/restore.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200908140210.31048-4-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3b5166bb8b268fb038ffb1f235929ac44668b989..151f11f14b063bcc931f5d1d79828ece7b38e555 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -537,7 +537,6 @@ struct intel_gmbus {
 
 struct i915_suspend_saved_registers {
        u32 saveDSPARB;
-       u32 saveCACHE_MODE_0;
        u32 saveSWF0[16];
        u32 saveSWF1[16];
        u32 saveSWF3[3];

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 80d9d2747640a5d6c95004e26a4d3a9fa368fa4d..7b64e713727002ab55dc989b981db0b24e297def 100644 (file)
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -71,10 +71,6 @@ int i915_save_state(struct drm_i915_private *dev_priv)
 
        i915_save_display(dev_priv);
 
-       /* Cache mode state */
-       if (INTEL_GEN(dev_priv) < 7)
-               dev_priv->regfile.saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
-
        /* Scratch space */
        if (IS_GEN(dev_priv, 2) && IS_MOBILE(dev_priv)) {
                for (i = 0; i < 7; i++) {
@@ -104,11 +100,6 @@ int i915_restore_state(struct drm_i915_private *dev_priv)
 
        i915_restore_display(dev_priv);
 
-       /* Cache mode state */
-       if (INTEL_GEN(dev_priv) < 7)
-               I915_WRITE(CACHE_MODE_0, dev_priv->regfile.saveCACHE_MODE_0 |
-                          0xffff0000);
-
        /* Scratch space */
        if (IS_GEN(dev_priv, 2) && IS_MOBILE(dev_priv)) {
                for (i = 0; i < 7; i++) {