| Message ID | 20180918181015.11001-5-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/6] drm/i915/runtime_pm: Share code to enable/disable PCH reset handshake | expand |
On Tue, Sep 18, 2018 at 11:10:14AM -0700, José Roberto de Souza wrote: > symmetric_memory do not change after initialization so lets just set > ipc_enabled once for this WA. > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 538bcde0bf7d..1392aa56a55a 100644 > --- 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); > } > > -- > 2.19.0 >
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 538bcde0bf7d..1392aa56a55a 100644 --- 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); }
symmetric_memory do not change after initialization so lets just set ipc_enabled once for this WA. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)