@@ -465,7 +465,7 @@ static const struct intel_device_info intel_cherryview_info = {
#define SKL_PLATFORM \
GEN9_FEATURES, \
- .first_product_revid = SKL_REVID_G0, \
+ .first_product_revid = SKL_REVID_PRODUCT, \
PLATFORM(INTEL_SKYLAKE)
static const struct intel_device_info intel_skylake_gt1_info = {
@@ -528,7 +528,7 @@ static const struct intel_device_info intel_skylake_gt4_info = {
static const struct intel_device_info intel_broxton_info = {
GEN9_LP_FEATURES,
PLATFORM(INTEL_BROXTON),
- .first_product_revid = BXT_REVID_C0,
+ .first_product_revid = BXT_REVID_PRODUCT,
.ddb_size = 512,
};
@@ -542,7 +542,7 @@ static const struct intel_device_info intel_geminilake_info = {
#define KBL_PLATFORM \
GEN9_FEATURES, \
PLATFORM(INTEL_KABYLAKE), \
- .first_product_revid = KBL_REVID_B0
+ .first_product_revid = KBL_REVID_PRODUCT
static const struct intel_device_info intel_kabylake_gt1_info = {
KBL_PLATFORM,
@@ -563,7 +563,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
#define CFL_PLATFORM \
GEN9_FEATURES, \
PLATFORM(INTEL_COFFEELAKE), \
- .first_product_revid = KBL_REVID_B0
+ .first_product_revid = KBL_REVID_PRODUCT
static const struct intel_device_info intel_coffeelake_gt1_info = {
CFL_PLATFORM,
@@ -137,6 +137,7 @@
#define SKL_REVID_E0 0x4
#define SKL_REVID_F0 0x5
#define SKL_REVID_G0 0x6
+#define SKL_REVID_PRODUCT SKL_REVID_G0
#define SKL_REVID_H0 0x7
#define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))
@@ -146,12 +147,14 @@
#define BXT_REVID_B0 0x3
#define BXT_REVID_B_LAST 0x8
#define BXT_REVID_C0 0x9
+#define BXT_REVID_PRODUCT BXT_REVID_C0
#define IS_BXT_REVID(dev_priv, since, until) \
(IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))
#define KBL_REVID_A0 0x0
#define KBL_REVID_B0 0x1
+#define KBL_REVID_PRODUCT KBL_REVID_B0
#define KBL_REVID_C0 0x2
#define KBL_REVID_D0 0x3
#define KBL_REVID_E0 0x4
Make a new named define for each platform which signifies the first production revid that platform has. Placing it along the revision ids adds clarity. Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 8 ++++---- drivers/gpu/drm/i915/intel_chipset.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-)