From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 10 Nov 2017 21:38:06 +0000 (-0800)
Subject: i965/gen10: Use the correct form of | for the RCPFE workaround
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=292701431369b49fdab14ef38840f4e66c6c0680;p=mesa.git

i965/gen10: Use the correct form of | for the RCPFE workaround

Found by inspection

Fixes: d3d0fe4572f62474b86ef3a68405046c68b54062
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c
index f5a991539e2..bae4ba7c003 100644
--- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
+++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
@@ -102,8 +102,8 @@ gen10_add_rcpfe_workaround_bits(uint32_t *flags)
    if (*flags & PIPE_CONTROL_RENDER_TARGET_FLUSH) {
       *flags = *flags | PIPE_CONTROL_STALL_AT_SCOREBOARD;
    } else if (*flags &
-             (PIPE_CONTROL_WRITE_IMMEDIATE ||
-              PIPE_CONTROL_WRITE_DEPTH_COUNT ||
+             (PIPE_CONTROL_WRITE_IMMEDIATE |
+              PIPE_CONTROL_WRITE_DEPTH_COUNT |
               PIPE_CONTROL_WRITE_TIMESTAMP)) {
       *flags = *flags | PIPE_CONTROL_DEPTH_STALL;
    }