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

diff --git a/sys/dev/pci/drm/i915/intel_pm.c b/sys/dev/pci/drm/i915/intel_pm.c
index c384892..52d0975 100644 (file)
--- 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;