From d3a0d3a80b3d0c6975a43075a8f1ee10b55bafaa Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 16 Jan 2020 16:35:00 -0800 Subject: [PATCH] anv: Drop some workarounds that are no longer necessary These workarounds are no longer required by 10th Gen hardware. Reviewed-by: Lionel Landwerlin Tested-by: Marge Bot Part-of: --- src/intel/vulkan/genX_state.c | 61 ----------------------------------- 1 file changed, 61 deletions(-) diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index 84843ad58db..877d3c01f0b 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -35,59 +35,6 @@ #include "vk_util.h" -#if GEN_GEN == 10 -/** - * From Gen10 Workarounds page in h/w specs: - * WaSampleOffsetIZ: - * "Prior to the 3DSTATE_SAMPLE_PATTERN driver must ensure there are no - * markers in the pipeline by programming a PIPE_CONTROL with stall." - */ -static void -gen10_emit_wa_cs_stall_flush(struct anv_batch *batch) -{ - - anv_batch_emit(batch, GENX(PIPE_CONTROL), pc) { - pc.CommandStreamerStallEnable = true; - pc.StallAtPixelScoreboard = true; - } -} - -/** - * From Gen10 Workarounds page in h/w specs: - * WaSampleOffsetIZ:_cs_stall_flush - * "When 3DSTATE_SAMPLE_PATTERN is programmed, driver must then issue an - * MI_LOAD_REGISTER_IMM command to an offset between 0x7000 and 0x7FFF(SVL) - * after the command to ensure the state has been delivered prior to any - * command causing a marker in the pipeline." - */ -static void -gen10_emit_wa_lri_to_cache_mode_zero(struct anv_batch *batch) -{ - /* Before changing the value of CACHE_MODE_0 register, GFX pipeline must - * be idle; i.e., full flush is required. - */ - anv_batch_emit(batch, GENX(PIPE_CONTROL), pc) { - pc.DepthCacheFlushEnable = true; - pc.DCFlushEnable = true; - pc.RenderTargetCacheFlushEnable = true; - pc.InstructionCacheInvalidateEnable = true; - pc.StateCacheInvalidationEnable = true; - pc.TextureCacheInvalidationEnable = true; - pc.VFCacheInvalidationEnable = true; - pc.ConstantCacheInvalidationEnable =true; - } - - /* Write to CACHE_MODE_0 (0x7000) */ - uint32_t cache_mode_0 = 0; - anv_pack_struct(&cache_mode_0, GENX(CACHE_MODE_0)); - - anv_batch_emit(batch, GENX(MI_LOAD_REGISTER_IMM), lri) { - lri.RegisterOffset = GENX(CACHE_MODE_0_num); - lri.DataDWord = cache_mode_0; - } -} -#endif - static void genX(emit_slice_hashing_state)(struct anv_device *device, struct anv_batch *batch) @@ -205,10 +152,6 @@ genX(init_device_state)(struct anv_device *device) #if GEN_GEN >= 8 anv_batch_emit(&batch, GENX(3DSTATE_WM_CHROMAKEY), ck); -#if GEN_GEN == 10 - gen10_emit_wa_cs_stall_flush(&batch); -#endif - /* See the Vulkan 1.0 spec Table 24.1 "Standard sample locations" and * VkPhysicalDeviceFeatures::standardSampleLocations. */ @@ -233,10 +176,6 @@ genX(init_device_state)(struct anv_device *device) anv_batch_emit(&batch, GENX(3DSTATE_WM_HZ_OP), hzp); #endif -#if GEN_GEN == 10 - gen10_emit_wa_lri_to_cache_mode_zero(&batch); -#endif - #if GEN_GEN == 11 /* The default behavior of bit 5 "Headerless Message for Pre-emptable * Contexts" in SAMPLER MODE register is set to 0, which means