@@ -1158,24 +1158,6 @@ static u32 *gen8_init_indirectctx_bb(struct intel_engine_cs *engine, u32 *batch)
1158
1158
return batch ;
1159
1159
}
1160
1160
1161
- /*
1162
- * This batch is started immediately after indirect_ctx batch. Since we ensure
1163
- * that indirect_ctx ends on a cacheline this batch is aligned automatically.
1164
- *
1165
- * The number of DWORDS written are returned using this field.
1166
- *
1167
- * This batch is terminated with MI_BATCH_BUFFER_END and so we need not add padding
1168
- * to align it with cacheline as padding after MI_BATCH_BUFFER_END is redundant.
1169
- */
1170
- static u32 * gen8_init_perctx_bb (struct intel_engine_cs * engine , u32 * batch )
1171
- {
1172
- /* WaDisableCtxRestoreArbitration:bdw,chv */
1173
- * batch ++ = MI_ARB_ON_OFF | MI_ARB_ENABLE ;
1174
- * batch ++ = MI_BATCH_BUFFER_END ;
1175
-
1176
- return batch ;
1177
- }
1178
-
1179
1161
static u32 * gen9_init_indirectctx_bb (struct intel_engine_cs * engine , u32 * batch )
1180
1162
{
1181
1163
/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt,glk */
@@ -1290,7 +1272,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
1290
1272
break ;
1291
1273
case 8 :
1292
1274
wa_bb_fn [0 ] = gen8_init_indirectctx_bb ;
1293
- wa_bb_fn [1 ] = gen8_init_perctx_bb ;
1275
+ wa_bb_fn [1 ] = NULL ;
1294
1276
break ;
1295
1277
default :
1296
1278
MISSING_CASE (INTEL_GEN (engine -> i915 ));
@@ -1534,13 +1516,15 @@ static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
1534
1516
if (IS_ERR (cs ))
1535
1517
return PTR_ERR (cs );
1536
1518
1519
+ /* WaDisableCtxRestoreArbitration:bdw,chv */
1520
+ * cs ++ = MI_ARB_ON_OFF | MI_ARB_ENABLE ;
1521
+
1537
1522
/* FIXME(BDW): Address space and security selectors. */
1538
1523
* cs ++ = MI_BATCH_BUFFER_START_GEN8 |
1539
1524
(flags & I915_DISPATCH_SECURE ? 0 : BIT (8 )) |
1540
1525
(flags & I915_DISPATCH_RS ? MI_BATCH_RESOURCE_STREAMER : 0 );
1541
1526
* cs ++ = lower_32_bits (offset );
1542
1527
* cs ++ = upper_32_bits (offset );
1543
- * cs ++ = MI_NOOP ;
1544
1528
intel_ring_advance (req , cs );
1545
1529
1546
1530
return 0 ;
0 commit comments