1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index f83d97ea4028..a1198baf34aa 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1140,8 +1140,8 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *ring,
 {
         uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
-        /* FIXME: Replace me with WA */
-        wa_ctx_emit(batch, MI_NOOP);
+        /* WaDisableCtxRestoreArbitration:bdw,chv */
+        wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_DISABLE);
 
         /* Pad to end of cacheline */
         while (index % CACHELINE_DWORDS)
@@ -1179,6 +1179,9 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *ring,
 {
         uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
+        /* WaDisableCtxRestoreArbitration:bdw,chv */
+        wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_ENABLE);
+
         wa_ctx_emit(batch, MI_BATCH_BUFFER_END);
 
         return wa_ctx_end(wa_ctx, *offset = index, 1);