From: Nick Hoath <nicholas.hoath@intel.com>
Date: Fri, 10 Apr 2015 12:12:26 +0000 (+0100)
Subject: drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent
X-Git-Tag: v4.2-rc1~13^2~54^2~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83a24979c40ebbf0fa0cd14df16f74142f373cd3;p=karo-tx-linux.git

drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Note that we also need this for skl.

Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
[danvet: Note that we also need this for skl, requested by Imre.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index b0bd9bb6676e..7ef9a29405cd 100644
--- 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;
 }