From: Mahesh Kumar <mahesh1.kumar@intel.com>
Date: Fri, 24 Aug 2018 09:32:24 +0000 (+0530)
Subject: drm/i915/skl+: don't trust IPC value set by BIOS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f361912aa9bfefbdf875b185fc93f2454d917b4a;p=openwrt%2Fstaging%2Fblogic.git

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 09463e3d7948..ac8177032faf 100644
--- 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);