diff mbox

drm/i915: Update preproduction steppings

Message ID 20180606141824.32462-1-mika.kuoppala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mika Kuoppala June 6, 2018, 2:18 p.m. UTC
Update preproduction steppings detection so that
we get the warning and taint correctly for more
recent platforms.

Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 4 ++++
 drivers/gpu/drm/i915/i915_drv.h | 3 +++
 2 files changed, 7 insertions(+)

Comments

Chris Wilson June 6, 2018, 2:28 p.m. UTC | #1
Quoting Mika Kuoppala (2018-06-06 15:18:24)
> Update preproduction steppings detection so that
> we get the warning and taint correctly for more
> recent platforms.

Before crying foul, I suggest we check INTEL_INFO()->is_alpha_support.
We don't want to taint SDP boxes as we work on them for stabilisation.
-Chris
Jani Nikula June 7, 2018, 3:07 p.m. UTC | #2
On Wed, 06 Jun 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Mika Kuoppala (2018-06-06 15:18:24)
>> Update preproduction steppings detection so that
>> we get the warning and taint correctly for more
>> recent platforms.
>
> Before crying foul, I suggest we check INTEL_INFO()->is_alpha_support.
> We don't want to taint SDP boxes as we work on them for stabilisation.

Agreed.

> -Chris
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6b599b1837dc..166ff1707522 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -857,6 +857,10 @@  static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)
 	pre |= IS_HSW_EARLY_SDV(dev_priv);
 	pre |= IS_SKL_REVID(dev_priv, 0, SKL_REVID_F0);
 	pre |= IS_BXT_REVID(dev_priv, 0, BXT_REVID_B_LAST);
+	pre |= IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0);
+	pre |= IS_GLK_REVID(dev_priv, 0, GLK_REVID_B0);
+	pre |= IS_CNL_REVID(dev_priv, 0, CNL_REVID_G0);
+	pre |= IS_ICL_REVID(dev_priv, 0, ICL_REVID_C0);
 
 	if (pre) {
 		DRM_ERROR("This is a pre-production stepping. "
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a4bb30c32a52..b36143a5451c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2460,6 +2460,7 @@  intel_info(const struct drm_i915_private *dev_priv)
 
 #define GLK_REVID_A0		0x0
 #define GLK_REVID_A1		0x1
+#define GLK_REVID_B0		0x3
 
 #define IS_GLK_REVID(dev_priv, since, until) \
 	(IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until))
@@ -2467,6 +2468,8 @@  intel_info(const struct drm_i915_private *dev_priv)
 #define CNL_REVID_A0		0x0
 #define CNL_REVID_B0		0x1
 #define CNL_REVID_C0		0x2
+#define CNL_REVID_D0		0x4
+#define CNL_REVID_G0		0x5
 
 #define IS_CNL_REVID(p, since, until) \
 	(IS_CANNONLAKE(p) && IS_REVID(p, since, until))