diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-03-26 15:21:34 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-03-29 14:56:08 +0300 |
commit | ef47b7ab1faa6d32af351690e0bf664f6c6721b8 (patch) | |
tree | 9136470f63998ce2bf7d24bae599249fce716efd /drivers/gpu/drm/i915/intel_step.h | |
parent | 439c8dccb6a7f74bf6b3721fa509ab202c66f899 (diff) |
drm/i915: switch KBL to the new stepping scheme
Add new symbolic names for revision ids, and convert KBL revids to use
them via the new stepping check macros.
This also fixes theoretical out of bounds access to kbl_revids array.
v3: upgrade dbg to warn on unknown revid (José)
v2: Rename stepping->step
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/79b6c48211c6b214165391d350d556bad748f747.1616764798.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_step.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_step.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h index 8b3ef19d935b..b29e15f71214 100644 --- a/drivers/gpu/drm/i915/intel_step.h +++ b/drivers/gpu/drm/i915/intel_step.h @@ -8,6 +8,8 @@ #include <linux/types.h> +struct drm_i915_private; + struct i915_rev_steppings { u8 gt_stepping; u8 disp_stepping; @@ -17,7 +19,6 @@ struct i915_rev_steppings { #define TGL_REVID_STEP_TBL_SIZE 2 #define ADLS_REVID_STEP_TBL_SIZE 13 -extern const struct i915_rev_steppings kbl_revids[]; extern const struct i915_rev_steppings tgl_uy_revid_step_tbl[TGL_UY_REVID_STEP_TBL_SIZE]; extern const struct i915_rev_steppings tgl_revid_step_tbl[TGL_REVID_STEP_TBL_SIZE]; extern const struct i915_rev_steppings adls_revid_step_tbl[ADLS_REVID_STEP_TBL_SIZE]; @@ -34,6 +35,14 @@ enum intel_step { STEP_B1, STEP_C0, STEP_D0, + STEP_D1, + STEP_E0, + STEP_F0, + STEP_G0, + STEP_FUTURE, + STEP_FOREVER, }; +void intel_step_init(struct drm_i915_private *i915); + #endif /* __INTEL_STEP_H__ */ |