drm/i915/psr: stop using bitwise OR with booleans in wm_optimization_wa()

Bitwise OR for booleans is a bit of an abuse. We can trivially drop the
usage.

Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f7ea5854c9a306f56f4142f8d37d567ee2f768a7.1730201504.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 6b7b154..1688893 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1781,18 +1781,19 @@ static void wm_optimization_wa(struct intel_dp *intel_dp,
 {
        struct intel_display *display = to_intel_display(intel_dp);
        enum pipe pipe = intel_dp->psr.pipe;
-       bool set_wa_bit = false;
+       bool activate = false;
 
        /* Wa_14015648006 */
-       if (IS_DISPLAY_VER(display, 11, 14))
-               set_wa_bit |= crtc_state->wm_level_disabled;
+       if (IS_DISPLAY_VER(display, 11, 14) && crtc_state->wm_level_disabled)
+               activate = true;
 
        /* Wa_16013835468 */
-       if (DISPLAY_VER(display) == 12)
-               set_wa_bit |= crtc_state->hw.adjusted_mode.crtc_vblank_start !=
-                       crtc_state->hw.adjusted_mode.crtc_vdisplay;
+       if (DISPLAY_VER(display) == 12 &&
+           crtc_state->hw.adjusted_mode.crtc_vblank_start !=
+           crtc_state->hw.adjusted_mode.crtc_vdisplay)
+               activate = true;
 
-       if (set_wa_bit)
+       if (activate)
                intel_de_rmw(display, GEN8_CHICKEN_DCPR_1,
                             0, LATENCY_REPORTING_REMOVED(pipe));
        else