---
 drivers/gpu/drm/i915/i915_drv.c                  |  6 ++---
 drivers/gpu/drm/i915/i915_drv.h                  |  2 +-
 drivers/gpu/drm/i915/i915_pci.c                  | 30 ++++++++++++------------
 drivers/gpu/drm/i915/intel_device_info.c         |  2 +-
 drivers/gpu/drm/i915/intel_device_info.h         |  2 +-
 drivers/gpu/drm/i915/selftests/mock_gem_device.c |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index daa9060bdfcb..35fc3f59fa8b 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -901,8 +901,8 @@ static int i915_driver_init_early(struct drm_i915_private 
*dev_priv,
                     sizeof(device_info->platform_mask) * BITS_PER_BYTE);
        device_info->platform_mask = BIT(device_info->platform);
 
-       BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * 
BITS_PER_BYTE);
-       device_info->gen_mask = BIT(device_info->gen - 1);
+       BUG_ON(device_info->__gen__ > sizeof(device_info->gen_mask) * 
BITS_PER_BYTE);
+       device_info->gen_mask = BIT(device_info->__gen__ - 1);
 
        spin_lock_init(&dev_priv->irq_lock);
        spin_lock_init(&dev_priv->gpu_error.lock);
@@ -1334,7 +1334,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct 
pci_device_id *ent)
        int ret;
 
        /* Enable nuclear pageflip on ILK+ */
-       if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
+       if (!i915_modparams.nuclear_pageflip && match_info->__gen__ < 5)
                driver.driver_features &= ~DRIVER_ATOMIC;
 
        ret = -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a3a02acfc345..141acb0a5840 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2542,7 +2542,7 @@ intel_info(const struct drm_i915_private *dev_priv)
 
 #define INTEL_INFO(dev_priv)   intel_info((dev_priv))
 
-#define INTEL_GEN(dev_priv)    ((dev_priv)->info.gen)
+#define INTEL_GEN(dev_priv)    ((dev_priv)->info.__gen__)
 #define INTEL_DEVID(dev_priv)  ((dev_priv)->info.device_id)
 
 #define REVID_FOREVER          0xff
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 4e7a10c89782..c94447b1a15a 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -63,7 +63,7 @@
        .page_sizes = I915_GTT_PAGE_SIZE_4K
 
 #define GEN2_FEATURES \
-       .gen = 2, .num_pipes = 1, \
+       .__gen__ = 2, .num_pipes = 1, \
        .has_overlay = 1, .overlay_needs_physical = 1, \
        .has_gmch_display = 1, \
        .hws_needs_physical = 1, \
@@ -100,7 +100,7 @@ static const struct intel_device_info intel_i865g_info = {
 };
 
 #define GEN3_FEATURES \
-       .gen = 3, .num_pipes = 2, \
+       .__gen__ = 3, .num_pipes = 2, \
        .has_gmch_display = 1, \
        .ring_mask = RENDER_RING, \
        .has_snoop = true, \
@@ -163,7 +163,7 @@ static const struct intel_device_info intel_pineview_info = 
{
 };
 
 #define GEN4_FEATURES \
-       .gen = 4, .num_pipes = 2, \
+       .__gen__ = 4, .num_pipes = 2, \
        .has_hotplug = 1, \
        .has_gmch_display = 1, \
        .ring_mask = RENDER_RING, \
@@ -205,7 +205,7 @@ static const struct intel_device_info intel_gm45_info = {
 };
 
 #define GEN5_FEATURES \
-       .gen = 5, .num_pipes = 2, \
+       .__gen__ = 5, .num_pipes = 2, \
        .has_hotplug = 1, \
        .ring_mask = RENDER_RING | BSD_RING, \
        .has_snoop = true, \
@@ -227,7 +227,7 @@ static const struct intel_device_info intel_ironlake_m_info 
= {
 };
 
 #define GEN6_FEATURES \
-       .gen = 6, .num_pipes = 2, \
+       .__gen__ = 6, .num_pipes = 2, \
        .has_hotplug = 1, \
        .has_fbc = 1, \
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
@@ -270,7 +270,7 @@ static const struct intel_device_info 
intel_sandybridge_m_gt2_info = {
 };
 
 #define GEN7_FEATURES  \
-       .gen = 7, .num_pipes = 3, \
+       .__gen__ = 7, .num_pipes = 3, \
        .has_hotplug = 1, \
        .has_fbc = 1, \
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
@@ -324,7 +324,7 @@ static const struct intel_device_info 
intel_ivybridge_q_info = {
 
 static const struct intel_device_info intel_valleyview_info = {
        .platform = INTEL_VALLEYVIEW,
-       .gen = 7,
+       .__gen__ = 7,
        .is_lp = 1,
        .num_pipes = 2,
        .has_psr = 1,
@@ -385,7 +385,7 @@ static const struct intel_device_info 
intel_haswell_gt3_info = {
 
 #define BDW_PLATFORM \
        GEN8_FEATURES, \
-       .gen = 8, \
+       .__gen__ = 8, \
        .platform = INTEL_BROADWELL
 
 static const struct intel_device_info intel_broadwell_gt1_info = {
@@ -413,7 +413,7 @@ static const struct intel_device_info 
intel_broadwell_gt3_info = {
 };
 
 static const struct intel_device_info intel_cherryview_info = {
-       .gen = 8, .num_pipes = 3,
+       .__gen__ = 8, .num_pipes = 3,
        .has_hotplug = 1,
        .is_lp = 1,
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
@@ -452,7 +452,7 @@ static const struct intel_device_info intel_cherryview_info 
= {
 
 #define SKL_PLATFORM \
        GEN9_FEATURES, \
-       .gen = 9, \
+       .__gen__ = 9, \
        .platform = INTEL_SKYLAKE
 
 static const struct intel_device_info intel_skylake_gt1_info = {
@@ -481,7 +481,7 @@ static const struct intel_device_info 
intel_skylake_gt4_info = {
 };
 
 #define GEN9_LP_FEATURES \
-       .gen = 9, \
+       .__gen__ = 9, \
        .is_lp = 1, \
        .has_hotplug = 1, \
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, \
@@ -526,7 +526,7 @@ static const struct intel_device_info intel_geminilake_info 
= {
 
 #define KBL_PLATFORM \
        GEN9_FEATURES, \
-       .gen = 9, \
+       .__gen__ = 9, \
        .platform = INTEL_KABYLAKE
 
 static const struct intel_device_info intel_kabylake_gt1_info = {
@@ -547,7 +547,7 @@ static const struct intel_device_info 
intel_kabylake_gt3_info = {
 
 #define CFL_PLATFORM \
        GEN9_FEATURES, \
-       .gen = 9, \
+       .__gen__ = 9, \
        .platform = INTEL_COFFEELAKE
 
 static const struct intel_device_info intel_coffeelake_gt1_info = {
@@ -575,13 +575,13 @@ static const struct intel_device_info 
intel_cannonlake_info = {
        GEN10_FEATURES,
        .is_alpha_support = 1,
        .platform = INTEL_CANNONLAKE,
-       .gen = 10,
+       .__gen__ = 10,
        .gt = 2,
 };
 
 #define GEN11_FEATURES \
        GEN10_FEATURES, \
-       .gen = 11, \
+       .__gen__ = 11, \
        .ddb_size = 2048, \
        .has_csr = 0
 
diff --git a/drivers/gpu/drm/i915/intel_device_info.c 
b/drivers/gpu/drm/i915/intel_device_info.c
index 298f8996cc54..2e79abff081b 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -115,7 +115,7 @@ void intel_device_info_dump(const struct intel_device_info 
*info,
                   INTEL_DEVID(dev_priv),
                   INTEL_REVID(dev_priv),
                   intel_platform_name(info->platform),
-                  info->gen);
+                  info->__gen__);
 
        intel_device_info_dump_flags(info, p);
 }
diff --git a/drivers/gpu/drm/i915/intel_device_info.h 
b/drivers/gpu/drm/i915/intel_device_info.h
index 71fdfb0451ef..927bf6c0122f 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -129,7 +129,7 @@ struct intel_device_info {
        u16 device_id;
        u16 gen_mask;
 
-       u8 gen;
+       u8 __gen__; /* Do not use directly, use INTEL_GEN */
        u8 gt; /* GT number, 0 if undefined */
        u8 num_rings;
        u8 ring_mask; /* Rings supported by the HW */
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c 
b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 3175db70cc6e..bf2280f28766 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -174,7 +174,7 @@ struct drm_i915_private *mock_gem_device(void)
        /* Using the global GTT may ask questions about KMS users, so prepare */
        drm_mode_config_init(&i915->drm);
 
-       mkwrite_device_info(i915)->gen = -1;
+       mkwrite_device_info(i915)->__gen__ = -1;
 
        mkwrite_device_info(i915)->page_sizes =
                I915_GTT_PAGE_SIZE_4K |
-- 
2.16.1

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

Reply via email to