From b92f135377cc1615c4d0878d54e15efa3118dd08 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 22 Nov 2022 10:47:58 +0200 Subject: [PATCH] anv: fixup context initialization on DG2 Fixing a typo :( Signed-off-by: Lionel Landwerlin Fixes: 507a86e131d6 ("anv: ensure CPS is initialized when KHR_fragment_shading_rate is disabled") Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit f7d6c6e1ed9919d37ceb05cbe5ed75b377253a3a) --- .pick_status.json | 2 +- src/intel/vulkan/genX_state.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 05a077626ff..cfbb6fe342f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -589,7 +589,7 @@ "description": "anv: fixup context initialization on DG2", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "507a86e131d648ecc85dc833f4821da6ac995cfe" }, diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index 6a547729dc4..f4c05440ef8 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -181,7 +181,7 @@ init_common_queue_state(struct anv_queue *queue, struct anv_batch *batch) /* Emit STATE_BASE_ADDRESS on Gfx12+ because we set a default CPS_STATE and * those are relative to STATE_BASE_ADDRESS::DynamicStateBaseAddress. */ -#if GFX_VERx >= 12 +#if GFX_VER >= 12 /* GEN:BUG:1607854226: * * Non-pipelined state has issues with not applying in MEDIA/GPGPU mode. @@ -233,7 +233,9 @@ init_common_queue_state(struct anv_queue *queue, struct anv_batch *batch) sba.BindlessSamplerStateBaseAddressModifyEnable = true; sba.BindlessSamplerStateBufferSize = 0; +#if GFX_VERx10 >= 125 sba.L1CacheControl = L1CC_WB; +#endif } #endif