From 20acb90a673a8ef0526be4de7abf4b9676020d98 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 22 Jun 2021 17:00:41 +1000 Subject: [PATCH] i965: fix regression in pipe control on g45 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cleanups got the wrong value here, just noticed in drive by. Fixes: b505db3864b0 ("intel: Simplify few version checks involving G4X") Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit 7c4478f43bbb18f6c71cb85433139c1a0d2cb697) --- .pick_status.json | 2 +- src/mesa/drivers/dri/i965/genX_pipe_control.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 36f56650315..52d64124efc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2893,7 +2893,7 @@ "description": "i965: fix regression in pipe control on g45", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b505db3864b097fa3bbf2a35bd3184554eb449d7" }, diff --git a/src/mesa/drivers/dri/i965/genX_pipe_control.c b/src/mesa/drivers/dri/i965/genX_pipe_control.c index 59e12d1da6e..d5f7e9da06f 100644 --- a/src/mesa/drivers/dri/i965/genX_pipe_control.c +++ b/src/mesa/drivers/dri/i965/genX_pipe_control.c @@ -495,7 +495,7 @@ genX(emit_raw_pipe_control)(struct brw_context *brw, uint32_t flags, pc.InstructionCacheInvalidateEnable = flags & PIPE_CONTROL_INSTRUCTION_INVALIDATE; pc.NotifyEnable = flags & PIPE_CONTROL_NOTIFY_ENABLE; - #if GFX_VER >= 45 + #if GFX_VERx10 >= 45 pc.IndirectStatePointersDisable = flags & PIPE_CONTROL_INDIRECT_STATE_POINTERS_DISABLE; #endif