drm/i915: Drop duplicate WaDisable4x2SubspanOptimization:hsw

tursulin · tursulin · commit ae9faeb9a2c9 · 2021-05-07T16:41:39.000+01:00
Same workaround was listed two times - once under the Gen7 block and once under the Haswell section. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210507084926.2423003-1-tvrtko.ursulin@linux.intel.com
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1859,9 +1859,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 			      CACHE_MODE_0_GEN7,
 			      /* enable HiZ Raw Stall Optimization */
 			      HIZ_RAW_STALL_OPT_DISABLE);
-
-		/* WaDisable4x2SubspanOptimization:hsw */
-		wa_masked_en(wal, CACHE_MODE_1, PIXEL_SUBSPAN_COLLECT_OPT_DISABLE);
 	}
 
 	if (IS_VALLEYVIEW(i915)) {

Original file line number	Diff line number	Diff line change
`@@ -1859,9 +1859,6 @@ rcs_engine_wa_init(struct intel_engine_cs engine, struct i915_wa_list wal)`
`1859`	`1859`	`CACHE_MODE_0_GEN7,`
`1860`	`1860`	`/* enable HiZ Raw Stall Optimization */`
`1861`	`1861`	`HIZ_RAW_STALL_OPT_DISABLE);`
`1862`		`-`
`1863`		`- /* WaDisable4x2SubspanOptimization:hsw */`
`1864`		`- wa_masked_en(wal, CACHE_MODE_1, PIXEL_SUBSPAN_COLLECT_OPT_DISABLE);`
`1865`	`1862`	`}`
`1866`	`1863`
`1867`	`1864`	`if (IS_VALLEYVIEW(i915)) {`