From cc191d96f68279e212edab759caef7ff097be2dd Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Fri, 1 Sep 2023 13:48:20 +0200 Subject: [PATCH] crocus: fix GFX_VERx10 macro Signed-off-by: Rohan Garg Reviewed-by: Lionel Landwerlin cc: mesa-stable Part-of: (cherry picked from commit 99a88ca4a2419dd2efb02d5b2f5352b8fb5786a0) --- .pick_status.json | 2 +- src/gallium/drivers/crocus/crocus_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ff0ac8ecc7e..ccfeb8b352b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8354,7 +8354,7 @@ "description": "crocus: fix GFX_VERx10 macro", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c index 7daf7c7fa76..5450a7f874c 100644 --- a/src/gallium/drivers/crocus/crocus_state.c +++ b/src/gallium/drivers/crocus/crocus_state.c @@ -1173,7 +1173,7 @@ setup_l3_config(struct crocus_batch *batch, const struct intel_l3_config *cfg) crocus_emit_lri(batch, L3CNTLREG2, l3cr2); crocus_emit_lri(batch, L3CNTLREG3, l3cr3); -#if GFX_VERSIONx10 == 75 +#if GFX_VERx10 == 75 /* TODO: Fail screen creation if command parser version < 4 */ uint32_t scratch1, chicken3; crocus_pack_state(GENX(SCRATCH1), &scratch1, reg) {