Skip to contentSkip to conversation

drm/i915/bxt: add workarounds

PATCH Applied Nick Hoath 4 participants 15 messages Apr 10, 2015 – May 7, 2015

Subsystems (2)
lore
Share & tools
lore

Nick Hoath

author
#0 lore raw

cover drm/i915/bxt: add workarounds

Add bxt specific workarounds.

Nick Hoath (3):
drm/i915/bxt: Add WaDisableThreadStallDopClockGating drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

 drivers/gpu/drm/i915/i915_reg.h         |  1 +
 drivers/gpu/drm/i915/intel_ringbuffer.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
Signature · 6 lines
2.1.1

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

PATCH 1/3 drm/i915/bxt: Add WaDisableThreadStallDopClockGating

---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
index 883e11f..5aad253 100644
@@ -1038,8 +1038,15 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
 
 static int bxt_init_workarounds(struct intel_engine_cs *ring)
 {
+	struct drm_device *dev = ring->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
 	gen9_init_workarounds(ring);
 
+	/* WaDisableThreadStallDopClockGating:bxt */
+	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
+			  STALL_DOP_GATING_DISABLE);
+
 	return 0;
 }
 
Signature · 6 lines
2.1.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/i915/bxt: Add WaDisableThreadStallDopClockGating

Quoted 1 line · Nick Hoath
Quoted 14 lines
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -0
index 883e11f..5aad253 100644
@@ -1038,8 +1038,15 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
 
 static int bxt_init_workarounds(struct intel_engine_cs *ring)
 {
+	struct drm_device *dev = ring->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/intel_ringbuffer.c static int skl_init_workarounds(struct intel_engine_cs *ring) · line 1052

Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -0
+
 	gen9_init_workarounds(ring);
 
+	/* WaDisableThreadStallDopClockGating:bxt */
+	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
+			  STALL_DOP_GATING_DISABLE);
+
 	return 0;
 }
 

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

#3 lore raw

Re: [PATCH 1/3] drm/i915/bxt: Add WaDisableThreadStallDopClockGating

Quoted 4 lines · Imre Deak
Quoted 1 line · Nick Hoath

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#4 lore raw

PATCH 2/3 drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing

In reply to Nick Hoath
---
 drivers/gpu/drm/i915/i915_reg.h         | 1 +
 drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 91eef06..d34432b 100644
@@ -6318,6 +6318,7 @@ enum skl_disp_power_wells {
 #define GEN7_HALF_SLICE_CHICKEN1_GT2	0xf100
 #define   GEN7_MAX_PS_THREAD_DEP		(8<<12)
 #define   GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE	(1<<10)
+#define   GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE	(1<<4)
 #define   GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE	(1<<3)
 
 #define GEN9_HALF_SLICE_CHICKEN5	0xe188
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
index 5aad253..eebee73 100644
@@ -1047,6 +1047,13 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
 	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
 			  STALL_DOP_GATING_DISABLE);
 
+	/* WaDisableSbeCacheDispatchPortSharing:bxt */
+	if (INTEL_REVID(dev) <= BXT_REVID_B0) {
+		WA_SET_BIT_MASKED(
+			GEN7_HALF_SLICE_CHICKEN1,
+			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+	}
+
 	return 0;
 }
 
Signature · 6 lines
2.1.1

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

Re: [PATCH 2/3] drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing

Quoted 23 lines · Nick Hoath
---
 drivers/gpu/drm/i915/i915_reg.h         | 1 +
 drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 91eef06..d34432b 100644
@@ -6318,6 +6318,7 @@ enum skl_disp_power_wells {
 #define GEN7_HALF_SLICE_CHICKEN1_GT2	0xf100
 #define   GEN7_MAX_PS_THREAD_DEP		(8<<12)
 #define   GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE	(1<<10)
+#define   GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE	(1<<4)
 #define   GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE	(1<<3)
 
 #define GEN9_HALF_SLICE_CHICKEN5	0xe188
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 5aad253..eebee73 100644

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1056

Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
@@ -1047,6 +1047,13 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
 	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
 			  STALL_DOP_GATING_DISABLE);
 
+	/* WaDisableSbeCacheDispatchPortSharing:bxt */
+	if (INTEL_REVID(dev) <= BXT_REVID_B0) {
+		WA_SET_BIT_MASKED(
+			GEN7_HALF_SLICE_CHICKEN1,
+			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+	}
+

This looks ok, but according to the WA DB it should also be added for SKL (<=F0) in gen9_init_workarounds.

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1059

Quoted 3 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
 	return 0;
 }
 

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

author
#6 lore raw

Re: [PATCH 2/3] drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing

Quoted 27 lines · Imre
Quoted 26 lines · Nick Hoath
---
  drivers/gpu/drm/i915/i915_reg.h         | 1 +
  drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 91eef06..d34432b 100644
@@ -6318,6 +6318,7 @@ enum skl_disp_power_wells {
  #define GEN7_HALF_SLICE_CHICKEN1_GT2	0xf100
  #define   GEN7_MAX_PS_THREAD_DEP		(8<<12)
  #define   GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE	(1<<10)
+#define   GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE	(1<<4)
  #define   GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE	(1<<3)
 
  #define GEN9_HALF_SLICE_CHICKEN5	0xe188
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 5aad253..eebee73 100644
@@ -1047,6 +1047,13 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
  	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
  			  STALL_DOP_GATING_DISABLE);
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1056

Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
+	/* WaDisableSbeCacheDispatchPortSharing:bxt */
+	if (INTEL_REVID(dev) <= BXT_REVID_B0) {
+		WA_SET_BIT_MASKED(
+			GEN7_HALF_SLICE_CHICKEN1,
+			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+	}
+

This looks ok, but according to the WA DB it should also be added for SKL (<=F0) in gen9_init_workarounds.

That would work against the concept of keeping these patches as bisectable as possible - Enabling these WAs for other SoCs should be done as another patch/patchset.

Quoted 5 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1059

Quoted 3 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
  	return 0;
  }
 

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

Reviewed-by
#7 lore raw

Re: [PATCH 2/3] drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing

Quoted 40 lines · Nick Hoath
Quoted 27 lines · Imre
Quoted 26 lines · Nick Hoath
---
  drivers/gpu/drm/i915/i915_reg.h         | 1 +
  drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 91eef06..d34432b 100644
@@ -6318,6 +6318,7 @@ enum skl_disp_power_wells {
  #define GEN7_HALF_SLICE_CHICKEN1_GT2	0xf100
  #define   GEN7_MAX_PS_THREAD_DEP		(8<<12)
  #define   GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE	(1<<10)
+#define   GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE	(1<<4)
  #define   GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE	(1<<3)
 
  #define GEN9_HALF_SLICE_CHICKEN5	0xe188
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 5aad253..eebee73 100644
@@ -1047,6 +1047,13 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
  	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
  			  STALL_DOP_GATING_DISABLE);
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1056

Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
+	/* WaDisableSbeCacheDispatchPortSharing:bxt */
+	if (INTEL_REVID(dev) <= BXT_REVID_B0) {
+		WA_SET_BIT_MASKED(
+			GEN7_HALF_SLICE_CHICKEN1,
+			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+	}
+

This looks ok, but according to the WA DB it should also be added for SKL (<=F0) in gen9_init_workarounds.

Quoted 3 lines

That would work against the concept of keeping these patches as bisectable as possible - Enabling these WAs for other SoCs should be done as another patch/patchset.

Ok, agreed about bisectability. But it's worth adding a code comment about SKL or at least mention it in the commit log, so we know we have to follow up on it. Also I'd still put this to gen9_init_workarounds with a platform check, since you'll need to move it there anyway and so you could reduce the diff of the follow-up patch. Either way this is:

Quoted 7 lines
Quoted 6 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1059

Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
  	return 0;
  }
 

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

#8 lore raw

Re: [PATCH 2/3] drm/i915/bxt: Add WaDisableSbeCacheDispatchPortSharing

Quoted 45 lines · Imre Deak
Quoted 40 lines · Nick Hoath
Quoted 27 lines · Imre
Quoted 26 lines · Nick Hoath
---
  drivers/gpu/drm/i915/i915_reg.h         | 1 +
  drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 91eef06..d34432b 100644
@@ -6318,6 +6318,7 @@ enum skl_disp_power_wells {
  #define GEN7_HALF_SLICE_CHICKEN1_GT2	0xf100
  #define   GEN7_MAX_PS_THREAD_DEP		(8<<12)
  #define   GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE	(1<<10)
+#define   GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE	(1<<4)
  #define   GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE	(1<<3)
 
  #define GEN9_HALF_SLICE_CHICKEN5	0xe188
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 5aad253..eebee73 100644
@@ -1047,6 +1047,13 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
  	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
  			  STALL_DOP_GATING_DISABLE);
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1056

Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
+	/* WaDisableSbeCacheDispatchPortSharing:bxt */
+	if (INTEL_REVID(dev) <= BXT_REVID_B0) {
+		WA_SET_BIT_MASKED(
+			GEN7_HALF_SLICE_CHICKEN1,
+			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
+	}
+

This looks ok, but according to the WA DB it should also be added for SKL (<=F0) in gen9_init_workarounds.

Quoted 3 lines

That would work against the concept of keeping these patches as bisectable as possible - Enabling these WAs for other SoCs should be done as another patch/patchset.

Quoted 7 lines

Ok, agreed about bisectability. But it's worth adding a code comment about SKL or at least mention it in the commit log, so we know we have to follow up on it. Also I'd still put this to gen9_init_workarounds with a platform check, since you'll need to move it there anyway and so you could reduce the diff of the follow-up patch. Either way this is:

Queued for -next, thanks for the patch. Imre, can you please supply the skl versions of these?

Cheers, Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#9 lore raw

PATCH 3/3 drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

In reply to Nick Hoath
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
index eebee73..cc62e5c 100644
@@ -1054,6 +1054,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;
 }
 
Signature · 6 lines
2.1.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 3/3
#10 lore raw

Re: [PATCH 3/3] drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Task id: 6173 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

PNV                                  276/276              276/276
ILK                                  302/302              302/302
SNB                 -34              313/313              279/313
IVB                                  337/337              337/337
BYT                                  286/286              286/286
HSW                                  395/395              395/395
BDW                                  321/321              321/321

-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt@gem_mmap_gtt@read-no-prefault PASS(5) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_cursor_crc@cursor-size-change DMESG_WARN(5)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@bo-too-big DMESG_WARN(5)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@bo-too-big-interruptible DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip_event_leak DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@flip-vs-dpms-off-vs-modeset DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@flip-vs-dpms-off-vs-modeset-interruptible DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@nonexisting-fb DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@nonexisting-fb-interruptible DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@single-buffer-flip-vs-dpms-off-vs-modeset DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_flip@single-buffer-flip-vs-dpms-off-vs-modeset-interruptible DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
*SNB igt@kms_flip_tiling@flip-changes-tiling DMESG_WARN(6)PASS(3) FAIL(1)DMESG_WARN(1)
SNB igt@kms_mmio_vs_cs_flip@setcrtc_vs_cs_flip DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_mmio_vs_cs_flip@setplane_vs_cs_flip DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@kms_rotation_crc@primary-rotation DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@cursor DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@cursor-dpms DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@debugfs-forcewake-user DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@dpms-non-lpsp DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@drm-resources-equal DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@fences DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@fences-dpms DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@gem-execbuf DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@gem-idle DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@gem-mmap-cpu DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@gem-mmap-gtt DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@gem-pread DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@i2c DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@modeset-non-lpsp DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@modeset-non-lpsp-stress-no-wait DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@pci-d3-state DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@reg-read-ioctl DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
SNB igt@pm_rpm@rte DMESG_WARN(6)PASS(3) DMESG_WARN(2)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

Re: [PATCH 3/3] drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

In reply to Nick Hoath
Quoted 10 lines · Nick Hoath
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index eebee73..cc62e5c 100644

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1060

Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
@@ -1054,6 +1054,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);
+

Looks ok, but again it needs to be added for SKL (all steppings) in gen9_init_workarounds.

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1063

Quoted 3 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
 	return 0;
 }
 

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

author
#12 lore raw

Re: [PATCH 3/3] drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Quoted 14 lines · Imre
Quoted 13 lines · Nick Hoath
---
  drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index eebee73..cc62e5c 100644
@@ -1054,6 +1054,10 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
  			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
  	}
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1060

Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
+	/* WaForceContextSaveRestoreNonCoherent:bxt */
+	WA_SET_BIT_MASKED(HDC_CHICKEN0,
+			  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT);
+

Looks ok, but again it needs to be added for SKL (all steppings) in gen9_init_workarounds.

The same argument as for patch 2/3 applies?

Quoted 6 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1063

Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
  	return 0;
  }
 

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

Reviewed-by
#13 lore raw

Re: [PATCH 3/3] drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Quoted 23 lines · Nick Hoath
Quoted 14 lines · Imre
Quoted 13 lines · Nick Hoath
---
  drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index eebee73..cc62e5c 100644
@@ -1054,6 +1054,10 @@ static int bxt_init_workarounds(struct intel_engine_cs *ring)
  			GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
  	}
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1060

Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
+	/* WaForceContextSaveRestoreNonCoherent:bxt */
+	WA_SET_BIT_MASKED(HDC_CHICKEN0,
+			  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT);
+

Looks ok, but again it needs to be added for SKL (all steppings) in gen9_init_workarounds.

Quoted 1 line

The same argument as for patch 2/3 applies?

Yes, applying this on SKL as a follow up is ok:

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

#14 lore raw

Re: [PATCH 3/3] drm/i915/bxt: Add WaForceContextSaveRestoreNonCoherent

Quoted 24 lines · Imre Deak
Quoted 23 lines · Nick Hoath
Quoted 21 lines · Imre
Quoted 10 lines · Nick Hoath
---
  drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index eebee73..cc62e5c 100644

drivers/gpu/drm/i915/intel_ringbuffer.c static int bxt_init_workarounds(struct intel_engine_cs *ring) · line 1060

Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
@@ -1054,6 +1054,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);
+

Looks ok, but again it needs to be added for SKL (all steppings) in gen9_init_workarounds.

Quoted 5 lines
Quoted 1 line

The same argument as for patch 2/3 applies?

Yes, applying this on SKL as a follow up is ok:

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx