[Mesa-dev] [PATCH] i965/gen10: Use the correct form of | for the RCPFE workaround

[Anuj Phogat]

On Fri, Nov 10, 2017 at 1:39 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
> Found by inspection
>
> Fixes: d3d0fe4572f62474b86ef3a68405046c68b54062
> Cc: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/drivers/dri/i965/brw_pipe_control.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> index f5a9915..bae4ba7 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;
>     }
> --
> 2.5.0.400.gff86faf
>
oops. Thanks for catching it.

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>