| Message ID | 20200430214654.51314-1-sultan@kerneltoast.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Don't enable WaIncreaseLatencyIPCEnabled when IPC is disabled | expand |
On Thu, Apr 30, 2020 at 02:46:54PM -0700, Sultan Alsawaf wrote: > From: Sultan Alsawaf <sultan@kerneltoast.com> > > 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> > --- > 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 8375054ba27d..a52986a9e7a6 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4992,7 +4992,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)) && Whoops. Thanks for the fix. Pushed. > dev_priv->ipc_enabled) > latency += 4; > > -- > 2.26.2
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8375054ba27d..a52986a9e7a6 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4992,7 +4992,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;