| From c2c994d171a9dbf2334778ba6d3b7bf0fa0f4f1b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Apr 2020 14:46:54 -0700 |
| Subject: drm/i915: Don't enable WaIncreaseLatencyIPCEnabled when IPC is |
| disabled |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Sultan Alsawaf <sultan@kerneltoast.com> |
| |
| [ Upstream commit 421abe200321a2c907ede1a6208c558284ba0b75 ] |
| |
| In commit 5a7d202b1574, a logical AND was erroneously changed to an OR, |
| causing WaIncreaseLatencyIPCEnabled to be enabled unconditionally for |
| kabylake and coffeelake, even when IPC is disabled. Fix the logic so |
| that WaIncreaseLatencyIPCEnabled is only used when IPC is enabled. |
| |
| Fixes: 5a7d202b1574 ("drm/i915: Drop WaIncreaseLatencyIPCEnabled/1140 for cnl") |
| Cc: stable@vger.kernel.org # 5.3.x+ |
| Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com> |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200430214654.51314-1-sultan@kerneltoast.com |
| (cherry picked from commit 690d22dafa88b82453516387b475664047a6bd14) |
| Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index bd2d30ecc030f..53c7b1a1b3551 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -4722,7 +4722,7 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state, |
| * WaIncreaseLatencyIPCEnabled: kbl,cfl |
| * Display WA #1141: kbl,cfl |
| */ |
| - if ((IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) || |
| + if ((IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) && |
| dev_priv->ipc_enabled) |
| latency += 4; |
| |
| -- |
| 2.20.1 |
| |
