Commit c9b818d3 authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Rodrigo Vivi

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180918204714.27306-5-jose.souza@intel.com
parent 6323113b
...@@ -6120,11 +6120,6 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv) ...@@ -6120,11 +6120,6 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv)
if (!HAS_IPC(dev_priv)) if (!HAS_IPC(dev_priv))
return; 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); val = I915_READ(DISP_ARB_CTL2);
if (dev_priv->ipc_enabled) if (dev_priv->ipc_enabled)
...@@ -6140,7 +6135,12 @@ void intel_init_ipc(struct drm_i915_private *dev_priv) ...@@ -6140,7 +6135,12 @@ void intel_init_ipc(struct drm_i915_private *dev_priv)
if (!HAS_IPC(dev_priv)) if (!HAS_IPC(dev_priv))
return; return;
/* 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; dev_priv->ipc_enabled = true;
intel_enable_ipc(dev_priv); intel_enable_ipc(dev_priv);
} }
......
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