drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Nick Hoath · danvet · commit 83a24979c40e · 2015-05-08T13:03:45.000+02:00
Note that we also need this for skl.

Signed-off-by: Nick Hoath &lt;nicholas.hoath@intel.com&gt;
Reviewed-by: Imre Deak &lt;imre.deak@intel.com&gt;
[danvet: Note that we also need this for skl, requested by Imre.]
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1057,6 +1057,10 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
 			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
 	}
 
+	/* WaForceContextSaveRestoreNonCoherent:bxt */
+	WA_SET_BIT_MASKED(HDC_CHICKEN0,
+			  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT);
+
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1057,6 +1057,10 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)`
`1057`	`1057`	`GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);`
`1058`	`1058`	`}`
`1059`	`1059`
	`1060`	`+ /* WaForceContextSaveRestoreNonCoherent:bxt */`
	`1061`	`+ WA_SET_BIT_MASKED(HDC_CHICKEN0,`
	`1062`	`+ HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT);`
	`1063`	`+`
`1060`	`1064`	`return 0;`
`1061`	`1065`	`}`
`1062`	`1066`