Skip to contentSkip to conversation

drm/i915: add a few missing platform tags to workaround tags

PATCH In review Jani Nikula 3 participants 6 messages Sep 26, 2016 – Sep 27, 2016

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

PATCH 1/2 drm/i915: add a few missing platform tags to workaround tags

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 drivers/gpu/drm/i915/intel_pm.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
index a4e37c8db782..7ace96be82a8 100644
@@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 					      ~GUC_ENABLE_MIA_CLOCK_GATING));
 	}
 
-	/* WaC6DisallowByGfxPause*/
+	/* WaC6DisallowByGfxPause:bxt */
 	if (IS_BXT_REVID(dev, 0, BXT_REVID_B0))
 		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
 
drivers/gpu/drm/i915/intel_pm.c +1 -1
index a860c4082eb8..fa6472b2d0c7 100644
@@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)
 	if (intel_enable_rc6() & INTEL_RC6_ENABLE)
 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
 	DRM_INFO("RC6 %s\n", onoff(rc6_mask & GEN6_RC_CTL_RC6_ENABLE));
-	/* WaRsUseTimeoutMode */
+	/* WaRsUseTimeoutMode:bxt */
 	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
 		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
 		I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
Signature · 6 lines
2.1.4

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

PATCH 2/2 drm/i915/skl: tell the user about pre-production hardware

From: Paulo Zanoni <[email protected]>

We just removed the implementation for all the pre-production workarounds, so now tell the user that we expect his machine to not work properly. Also convert this to DRM_ERROR so we can more easily spot these problems in bug reports and CI/QA runs.

---

resending here to get CI results

---
 drivers/gpu/drm/i915/i915_drv.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +14 -7
index bfb2efd8d4d4..9c1543240e27 100644
@@ -771,6 +771,19 @@ static void i915_workqueues_cleanup(struct drm_i915_private *dev_priv)
 	destroy_workqueue(dev_priv->wq);
 }
 
+/*
+ * We don't keep the workarounds for pre-production hardware, so we expect our
+ * driver to fail on these machines in one way or another. A little warning on
+ * dmesg may help both the user and the bug triagers.
+ */
+static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)
+{
+	if (IS_HSW_EARLY_SDV(dev_priv) ||
+	    IS_SKL_REVID(dev_priv, 0, SKL_REVID_F0))
+		DRM_ERROR("This is a pre-production stepping. "
+			  "It may not be fully functional.\n");
+}
+
 /**
  * i915_driver_init_early - setup state not requiring device access
  * @dev_priv: device private
@@ -838,13 +851,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
 
 	intel_device_info_dump(dev_priv);
 
-	/* Not all pre-production machines fall into this category, only the
-	 * very first ones. Almost everything should work, except for maybe
-	 * suspend/resume. And we don't implement workarounds that affect only
-	 * pre-production machines. */
-	if (IS_HSW_EARLY_SDV(dev_priv))
-		DRM_INFO("This is an early pre-production Haswell machine. "
-			 "It may not be fully functional.\n");
+	intel_detect_preproduction_hw(dev_priv);
 
 	return 0;
 
Signature · 6 lines
2.1.4

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

✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags
URL : https://patchwork.freedesktop.org/series/12925/
State : warning

== Summary ==

Series 12925v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/12925/revisions/1/mbox/

Test kms_cursor_legacy:

        Subgroup basic-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-skl-6700k)
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                dmesg-warn -> PASS       (fi-skl-6700hq)
fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 
fi-byt-n2820     total:244  pass:208  dwarn:0   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ilk-650       total:244  pass:182  dwarn:0   dfail:0   fail:2   skip:60 
fi-ivb-3520m     total:244  pass:219  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6700k     total:244  pass:218  dwarn:2   dfail:0   fail:0   skip:24 
fi-skl-6770hq    total:244  pass:228  dwarn:1   dfail:0   fail:1   skip:14 
fi-snb-2520m     total:244  pass:208  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_2576/

aab15c274da587bcab19376d2caa9d6626440335 drm-intel-nightly: 2016y-09m-26d-12h-11m-33s UTC integration manifest dd59906 drm/i915/skl: tell the user about pre-production hardware
f9db5c5 drm/i915: add a few missing platform tags to workaround tags

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

#3 lore raw

Re: ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags

Em Seg, 2016-09-26 às 13:20 +0000, Patchwork escreveu:

Quoted 9 lines

== Series Details ==

Series: series starting with [1/2] drm/i915: add a few missing platform tags to workaround tags
URL   : https://patchwork.freedesktop.org/series/12925/
State : warning

== Summary ==

Quoted 7 lines

Series 12925v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/12925/revisions/1/mb
ox/

Test kms_cursor_legacy:
        Subgroup basic-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-skl-6700k)

That's "just" a FIFO underrun, which is unfortunately normal for SKL.

Quoted 40 lines

Test kms_psr_sink_crc:
        Subgroup psr_basic:
                dmesg-warn -> PASS       (fi-skl-6700hq)

fi-bdw-
5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 fi-bsw-
n3050     total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 fi-byt-
n2820     total:244  pass:208  dwarn:0   dfail:0   fail:1   skip:35 fi-hsw-
4770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 fi-hsw-
4770r     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 fi-ilk-
650       total:244  pass:182  dwarn:0   dfail:0   fail:2   skip:60 fi-ivb-
3520m     total:244  pass:219  dwarn:0   dfail:0   fail:0   skip:25 fi-ivb-
3770      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 fi-skl-
6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 fi-skl-
6700hq    total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 fi-skl-
6700k     total:244  pass:218  dwarn:2   dfail:0   fail:0   skip:24 fi-skl-
6770hq    total:244  pass:228  dwarn:1   dfail:0   fail:1   skip:14 fi-snb-
2520m     total:244  pass:208  dwarn:0   dfail:0   fail:0   skip:36 fi-snb-
2600      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37

Results at /archive/results/CI_IGT_test/Patchwork_2576/

aab15c274da587bcab19376d2caa9d6626440335 drm-intel-nightly: 2016y- 09m-26d-12h-11m-33s UTC integration manifest
dd59906 drm/i915/skl: tell the user about pre-production hardware f9db5c5 drm/i915: add a few missing platform tags to workaround tags

Quoted 4 lines

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

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

Reviewed-by on v1 1/2
#4 lore raw
In reply to Jani Nikula

Em Seg, 2016-09-26 às 15:07 +0300, Jani Nikula escreveu:

Quoted 2 lines
Quoted 34 lines

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 drivers/gpu/drm/i915/intel_pm.c         | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index a4e37c8db782..7ace96be82a8 100644
@@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private
 *dev_priv)

        ~GUC_ENABLE_MIA_CLOCK_ GATING));
  }

drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
-	/* WaC6DisallowByGfxPause*/
+	/* WaC6DisallowByGfxPause:bxt */

  if (IS_BXT_REVID(dev, 0, BXT_REVID_B0)) I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);

drivers/gpu/drm/i915/intel_pm.c +0 -0
index a860c4082eb8..fa6472b2d0c7 100644
@@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct
 drm_i915_private *dev_priv)
  	if (intel_enable_rc6() & INTEL_RC6_ENABLE)
  		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;

  DRM_INFO("RC6 %s\n", onoff(rc6_mask &
GEN6_RC_CTL_RC6_ENABLE));

drivers/gpu/drm/i915/intel_pm.c +1 -1
-	/* WaRsUseTimeoutMode */
+	/* WaRsUseTimeoutMode:bxt */
Quoted 3 lines

  if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) { I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */ I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |

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

#5 lore raw
Quoted 5 lines · Paulo Zanoni

Em Seg, 2016-09-26 às 15:07 +0300, Jani Nikula escreveu:

Quoted 2 lines

Thanks, pushed both to dinq.

BR,
Jani.

Quoted 38 lines
Quoted 38 lines

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 drivers/gpu/drm/i915/intel_pm.c         | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index a4e37c8db782..7ace96be82a8 100644
@@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private
 *dev_priv)

        ~GUC_ENABLE_MIA_CLOCK_ GATING));
  }

drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
-	/* WaC6DisallowByGfxPause*/
+	/* WaC6DisallowByGfxPause:bxt */

  if (IS_BXT_REVID(dev, 0, BXT_REVID_B0)) I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);

drivers/gpu/drm/i915/intel_pm.c +0 -0
index a860c4082eb8..fa6472b2d0c7 100644
@@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct
 drm_i915_private *dev_priv)
  	if (intel_enable_rc6() & INTEL_RC6_ENABLE)
  		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;

  DRM_INFO("RC6 %s\n", onoff(rc6_mask &
GEN6_RC_CTL_RC6_ENABLE));

drivers/gpu/drm/i915/intel_pm.c +1 -1
-	/* WaRsUseTimeoutMode */
+	/* WaRsUseTimeoutMode:bxt */

  if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) { I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */ I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx