drm/i915: Move IPC WA #1141 to init_ipc()

symmetric_memory do not change after initialization so lets just set
ipc_enabled once for this WA.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180918204714.27306-5-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 538bcde0bf7dd2be609f1fb67e5ca734a1a5184e..1392aa56a55aed28c8629d0d13b8be94e88a133a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6120,11 +6120,6 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv)
        if (!HAS_IPC(dev_priv))
                return;
 
-       /* Display WA #1141: SKL:all KBL:all CFL */
-       if ((IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) &&
-           !dev_priv->dram_info.symmetric_memory)
-               dev_priv->ipc_enabled = false;
-
        val = I915_READ(DISP_ARB_CTL2);
 
        if (dev_priv->ipc_enabled)
@@ -6140,7 +6135,12 @@ void intel_init_ipc(struct drm_i915_private *dev_priv)
        if (!HAS_IPC(dev_priv))
                return;
 
-       dev_priv->ipc_enabled = true;
+       /* Display WA #1141: SKL:all KBL:all CFL */
+       if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
+               dev_priv->ipc_enabled = dev_priv->dram_info.symmetric_memory;
+       else
+               dev_priv->ipc_enabled = true;
+
        intel_enable_ipc(dev_priv);
 }