diff mbox

[v3,3/6] drm/i915/gen8: Add WaDisableCtxRestoreArbitration workaround

Message ID 1433500446-26929-4-git-send-email-arun.siluvery@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

arun.siluvery@linux.intel.com June 5, 2015, 10:34 a.m. UTC 
In Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitration

Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_lrc.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 20c56e4..2fdb3da 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1099,9 +1099,10 @@  static int gen8_init_indirectctx_bb(struct intel_engine_cs *ring)
 		return -EINVAL;
 	}
 
-	/* FIXME: fill unused locations with NOOPs.
-	 * Replace these instructions with WA
-	 */
+	/* WaDisableCtxRestoreArbitration:bdw,chv */
+	reg_state[index++] = MI_ARB_ON_OFF | MI_ARB_DISABLE;
+
+	/* padding */
         while (index < end)
 		reg_state[index++] = MI_NOOP;
 
@@ -1136,9 +1137,10 @@  static int gen8_init_perctx_bb(struct intel_engine_cs *ring)
 		return -EINVAL;
 	}
 
-	/* FIXME: fill unused locations with NOOPs.
-	 * Replace these instructions with WA
-	 */
+	/* WaDisableCtxRestoreArbitration:bdw,chv */
+	reg_state[index++] = MI_ARB_ON_OFF | MI_ARB_ENABLE;
+
+	/* padding */
         while (index < end)
 		reg_state[index++] = MI_NOOP;