]> git.proxmox.com Git - mirror_ubuntu-impish-kernel.git/commit
drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk()
authorNathan Chancellor <nathan@kernel.org>
Thu, 14 Oct 2021 21:19:16 +0000 (14:19 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 7 Mar 2022 17:39:09 +0000 (18:39 +0100)
commit5afc2876c09edf0266b716f9805d76120b7f4f9f
tree1d9f58438d75d3961cf7bac9c96dbac2bd22f1be
parentc56beeaa062548239242d13e1acf88e716a86696
drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk()

BugLink: https://bugs.launchpad.net/bugs/1960452
commit 2e70570656adfe1c5d9a29940faa348d5f132199 upstream.

A new warning in clang points out a place in this file where a bitwise
OR is being used with boolean types:

drivers/gpu/drm/i915/intel_pm.c:3066:12: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical]
        changed = ilk_increase_wm_latency(dev_priv, dev_priv->wm.pri_latency, 12) |
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This construct is intentional, as it allows every one of the calls to
ilk_increase_wm_latency() to occur (instead of short circuiting with
logical OR) while still caring about the result of each call.

To make this clearer to the compiler, use the '|=' operator to assign
the result of each ilk_increase_wm_latency() call to changed, which
keeps the meaning of the code the same but makes it obvious that every
one of these calls is expected to happen.

Link: https://github.com/ClangBuiltLinux/linux/issues/1473
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Suggested-by: Dávid Bolvanský <david.bolvansky@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211014211916.3550122-1-nathan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/gpu/drm/i915/intel_pm.c