drm/i915/skl+: don't trust IPC value set by BIOS

If KMS decide to disable IPC make sure we override IPC configuration set
by BIOS.

Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180824093225.12598-5-mahesh1.kumar@intel.com

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 09463e3d7948afe9dc06c5068d1063dbe1dc9bf9..ac8177032faf37f682a9f8b98e3bfb9d64946cba 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6118,10 +6118,8 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv)
        u32 val;
 
        /* Display WA #0477 WaDisableIPC: skl */
-       if (IS_SKYLAKE(dev_priv)) {
+       if (IS_SKYLAKE(dev_priv))
                dev_priv->ipc_enabled = false;
-               return;
-       }
 
        val = I915_READ(DISP_ARB_CTL2);