From 520f3e27b5b785c606f6fd465ada0334ca08efeb Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 26 Oct 2020 17:23:59 +0100 Subject: [PATCH] radeonsi: fix RADEON_FLUSH flags conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RADEON_FLUSH_TOGGLE_SECURE_SUBMISSION and RADEON_FLUSH_NOOP used the same value. Fixes: ed3c5fe4694 ("radeonsi: implement GL_INTEL_blackhole_render") Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeon/radeon_winsys.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 5cb238cefe5..ae124bdb968 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -29,15 +29,15 @@ /* The public winsys interface header for the radeon driver. */ /* Skip command submission. Same as RADEON_NOOP=1. */ -#define RADEON_FLUSH_NOOP (1u << 30) - -/* Whether the next IB can start immediately and not wait for draws and - * dispatches from the current IB to finish. */ -#define RADEON_FLUSH_START_NEXT_GFX_IB_NOW (1u << 31) +#define RADEON_FLUSH_NOOP (1u << 29) /* Toggle the secure submission boolean after the flush */ #define RADEON_FLUSH_TOGGLE_SECURE_SUBMISSION (1u << 30) +/* Whether the next IB can start immediately and not wait for draws and + * dispatches from the current IB to finish. */ +#define RADEON_FLUSH_START_NEXT_GFX_IB_NOW (1u << 31) + #define RADEON_FLUSH_ASYNC_START_NEXT_GFX_IB_NOW \ (PIPE_FLUSH_ASYNC | RADEON_FLUSH_START_NEXT_GFX_IB_NOW)