Skip to contentSkip to conversation

drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport

PATCH Applied [email protected] 4 participants 4 messages Apr 19, 2016 – Apr 20, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport

From: Tim Gore <[email protected]>

WaEnableSamplerGPGPUPreemptionSupport fixes a problem related to mid thread pre-emption.

---
 drivers/gpu/drm/i915/i915_reg.h         | 1 +
 drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 9464ba3..2982470b 100644
@@ -7162,6 +7162,7 @@ enum skl_disp_power_wells {
 
 #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
 #define   GEN9_ENABLE_YV12_BUGFIX	(1<<4)
+#define   GEN9_ENABLE_GPGPU_PREEMPTION	(1<<2)
 
 /* Audio */
 #define G4X_AUD_VID_DID			_MMIO(dev_priv->info.display_mmio_offset + 0x62020)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -3
index 0d24494..444d30a 100644
@@ -959,9 +959,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
 	}
 
 	/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt */
-	if (IS_SKL_REVID(dev, SKL_REVID_C0, REVID_FOREVER) || IS_BROXTON(dev))
-		WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
-				  GEN9_ENABLE_YV12_BUGFIX);
+	/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt */
+	WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
+			  GEN9_ENABLE_YV12_BUGFIX |
+			  GEN9_ENABLE_GPGPU_PREEMPTION);
 
 	/* Wa4x4STCOptimizationDisable:skl,bxt */
 	/* WaDisablePartialResolveInVc:skl,bxt */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport (rev4)

== Series Details ==

== Series Details ==

Series: drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport (rev4)
URL : https://patchwork.freedesktop.org/series/5367/
State : success

== Summary ==

Series 5367v4 drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport
http://patchwork.freedesktop.org/api/1.0/series/5367/revisions/4/mbox/

Test kms_force_connector_basic:

        Subgroup force-load-detect:
                pass       -> SKIP       (ivb-t430s)
bdw-nuci7        total:192  pass:180  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:192  pass:169  dwarn:0   dfail:0   fail:0   skip:23 
bsw-nuc-2        total:191  pass:152  dwarn:0   dfail:0   fail:0   skip:39 
byt-nuc          total:191  pass:153  dwarn:0   dfail:0   fail:0   skip:38 
hsw-brixbox      total:192  pass:168  dwarn:0   dfail:0   fail:0   skip:24 
hsw-gt2          total:192  pass:173  dwarn:0   dfail:0   fail:0   skip:19 
ilk-hp8440p      total:192  pass:135  dwarn:0   dfail:0   fail:0   skip:57 
ivb-t430s        total:192  pass:163  dwarn:0   dfail:0   fail:0   skip:29 
skl-i7k-2        total:192  pass:167  dwarn:0   dfail:0   fail:0   skip:25 
skl-nuci5        total:192  pass:181  dwarn:0   dfail:0   fail:0   skip:11 
snb-dellxps      total:192  pass:154  dwarn:0   dfail:0   fail:0   skip:38 
snb-x220t        total:192  pass:154  dwarn:0   dfail:0   fail:1   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_1945/

d029fc773a2f0e8a3149626d053ab8a2e7669b11 drm-intel-nightly: 2016y-04m-19d-14h-58m-08s UTC integration manifest de5007c drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Re: ✓ Fi.CI.BAT: success for drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport (rev4)

Quoted 28 lines · Patchwork

== Series Details ==

Series: drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport (rev4)
URL : https://patchwork.freedesktop.org/series/5367/
State : success

== Summary ==

Series 5367v4 drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport
http://patchwork.freedesktop.org/api/1.0/series/5367/revisions/4/mbox/

Test kms_force_connector_basic:

         Subgroup force-load-detect:
                 pass       -> SKIP       (ivb-t430s)
bdw-nuci7        total:192  pass:180  dwarn:0   dfail:0   fail:0   skip:12
bdw-ultra        total:192  pass:169  dwarn:0   dfail:0   fail:0   skip:23
bsw-nuc-2        total:191  pass:152  dwarn:0   dfail:0   fail:0   skip:39
byt-nuc          total:191  pass:153  dwarn:0   dfail:0   fail:0   skip:38
hsw-brixbox      total:192  pass:168  dwarn:0   dfail:0   fail:0   skip:24
hsw-gt2          total:192  pass:173  dwarn:0   dfail:0   fail:0   skip:19
ilk-hp8440p      total:192  pass:135  dwarn:0   dfail:0   fail:0   skip:57
ivb-t430s        total:192  pass:163  dwarn:0   dfail:0   fail:0   skip:29
skl-i7k-2        total:192  pass:167  dwarn:0   dfail:0   fail:0   skip:25
skl-nuci5        total:192  pass:181  dwarn:0   dfail:0   fail:0   skip:11
snb-dellxps      total:192  pass:154  dwarn:0   dfail:0   fail:0   skip:38
snb-x220t        total:192  pass:154  dwarn:0   dfail:0   fail:1   skip:37
Quoted 4 lines

Results at /archive/results/CI_IGT_test/Patchwork_1945/

d029fc773a2f0e8a3149626d053ab8a2e7669b11 drm-intel-nightly: 2016y-04m-19d-14h-58m-08s UTC integration manifest de5007c drm/i915/gen9: implement WaEnableSamplerGPGPUPreemptionSupport

Merged, thanks for the patch and review!

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#3 lore raw
In reply to [email protected]
Quoted 6 lines · On 19/04/16 15:45, [email protected] wrote:

From: Tim Gore <[email protected]>

WaEnableSamplerGPGPUPreemptionSupport fixes a problem related to mid thread pre-emption.

Quoted 26 lines
---
  drivers/gpu/drm/i915/i915_reg.h         | 1 +
  drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++---
  2 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 9464ba3..2982470b 100644
@@ -7162,6 +7162,7 @@ enum skl_disp_power_wells {
 
  #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
  #define   GEN9_ENABLE_YV12_BUGFIX	(1<<4)
+#define   GEN9_ENABLE_GPGPU_PREEMPTION	(1<<2)
 
  /* Audio */
  #define G4X_AUD_VID_DID			_MMIO(dev_priv->info.display_mmio_offset + 0x62020)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 0d24494..444d30a 100644
@@ -959,9 +959,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
  	}
 
  	/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt */

drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *engine) · line 968

Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -3
-	if (IS_SKL_REVID(dev, SKL_REVID_C0, REVID_FOREVER) || IS_BROXTON(dev))
-		WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
-				  GEN9_ENABLE_YV12_BUGFIX);
+	/* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt */
+	WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
+			  GEN9_ENABLE_YV12_BUGFIX |
+			  GEN9_ENABLE_GPGPU_PREEMPTION);
 
  	/* Wa4x4STCOptimizationDisable:skl,bxt */
  	/* WaDisablePartialResolveInVc:skl,bxt */

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx