From 09a4af9132c92ff5aa378c879300bc1d8dbc50b7 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 16 Jan 2022 22:43:26 +0000 Subject: drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() From Nathan Chancellor 48d56b00c35266b00ec92aaf0db5b71ce1f27702 in linux 5.15.y/5.15.15 2e70570656adfe1c5d9a29940faa348d5f132199 in mainline linux --- sys/dev/pci/drm/i915/intel_pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/pci') diff --git a/sys/dev/pci/drm/i915/intel_pm.c b/sys/dev/pci/drm/i915/intel_pm.c index c384892ba32..52d09758702 100644 --- a/sys/dev/pci/drm/i915/intel_pm.c +++ b/sys/dev/pci/drm/i915/intel_pm.c @@ -3065,9 +3065,9 @@ static void snb_wm_latency_quirk(struct drm_i915_private *dev_priv) * The BIOS provided WM memory latency values are often * inadequate for high resolution displays. Adjust them. */ - changed = ilk_increase_wm_latency(dev_priv, dev_priv->wm.pri_latency, 12) | - ilk_increase_wm_latency(dev_priv, dev_priv->wm.spr_latency, 12) | - ilk_increase_wm_latency(dev_priv, dev_priv->wm.cur_latency, 12); + changed = ilk_increase_wm_latency(dev_priv, dev_priv->wm.pri_latency, 12); + changed |= ilk_increase_wm_latency(dev_priv, dev_priv->wm.spr_latency, 12); + changed |= ilk_increase_wm_latency(dev_priv, dev_priv->wm.cur_latency, 12); if (!changed) return; -- cgit v1.2.3