Commit 3dd22d46 authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915/glk: Use revid->stepping tables 



Switch GLK to use a revid->stepping table as we're trying to do on all
platforms going forward.  Pre-production and placeholder revisions are
omitted.

Although nothing in the code is using the data from this table at the
moment, we expect some upcoming DMC patches to start utilizing it.

Bspec: 19131
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210713193635.3390052-7-matthew.d.roper@intel.com
parent fd51fa8a

drivers/gpu/drm/i915/i915_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -1463,14 +1463,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_KBL_DISPLAY_STEP(dev_priv, since, until) \

	(IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until))



#define GLK_REVID_A0		0x0

#define GLK_REVID_A1		0x1

#define GLK_REVID_A2		0x2

#define GLK_REVID_B0		0x3



#define IS_GLK_REVID(dev_priv, since, until) \

	(IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until))



#define CNL_REVID_A0		0x0

#define CNL_REVID_B0		0x1

#define CNL_REVID_C0		0x2

drivers/gpu/drm/i915/intel_step.c

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ static const struct intel_step_info bxt_revids[] = { 
	[0xD] = { COMMON_STEP(E0) },

};



static const struct intel_step_info glk_revids[] = {

	[3] = { COMMON_STEP(B0) },

};



static const struct intel_step_info tgl_uy_revids[] = {

	[0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },

	[1] = { .gt_step = STEP_B0, .display_step = STEP_C0 },
@@ -96,6 +100,9 @@ void intel_step_init(struct drm_i915_private *i915) 
	} else if (IS_TIGERLAKE(i915)) {

		revids = tgl_revids;

		size = ARRAY_SIZE(tgl_revids);

	} else if (IS_GEMINILAKE(i915)) {

		revids = glk_revids;

		size = ARRAY_SIZE(glk_revids);

	} else if (IS_BROXTON(i915)) {

		revids = bxt_revids;

		size = ARRAY_SIZE(bxt_revids);