All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 08/12] drm/i915: finish removal of gen from intel_device_info
Date: Wed,  7 Apr 2021 17:41:56 -0700	[thread overview]
Message-ID: <20210408004200.984176-9-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20210408004200.984176-1-lucas.demarchi@intel.com>

Now that it's not being used anymore, finish its removal. Like for
gen_mask, we replace INTEL_GEN() and IS_GEN()  macros to use the new
field.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h                  | 10 +++++-----
 drivers/gpu/drm/i915/i915_pci.c                  |  1 -
 drivers/gpu/drm/i915/intel_device_info.h         |  1 -
 drivers/gpu/drm/i915/selftests/mock_gem_device.c |  2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 317249f47198..b65a4e4e4eea 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1240,11 +1240,15 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
  * Deprecated: this will be replaced by individual IP checks:
  * GRAPHICS_VER(), MEDIA_VER and DISPLAY_VER()
  */
-#define INTEL_GEN(dev_priv)		(INTEL_INFO(dev_priv)->gen)
+#define INTEL_GEN(dev_priv)		GRAPHICS_VER(dev_priv)
 /*
  * Deprecated: use IS_GRAPHICS_RANGE()
  */
 #define IS_GEN_RANGE(dev_priv, s, e)	IS_GRAPHICS_RANGE(dev_priv, (s), (e))
+/*
+ * Deprecated: use IS_GRAPHICS_VER()
+ */
+#define IS_GEN(dev_priv, n)		IS_GRAPHICS_VER(dev_priv, (n))
 
 #define GRAPHICS_VER(i915)		(INTEL_INFO(i915)->graphics_ver)
 #define IS_GRAPHICS_RANGE(i915, from, until) \
@@ -1264,10 +1268,6 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
 #define REVID_FOREVER		0xff
 #define INTEL_REVID(dev_priv)	(to_pci_dev((dev_priv)->drm.dev)->revision)
 
-#define IS_GEN(dev_priv, n) \
-	(BUILD_BUG_ON_ZERO(!__builtin_constant_p(n)) + \
-	 INTEL_INFO(dev_priv)->gen == (n))
-
 #define HAS_DSB(dev_priv)	(INTEL_INFO(dev_priv)->display.has_dsb)
 
 /*
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 3b9cd1af0f28..1453c1436f31 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -37,7 +37,6 @@
 
 #define PLATFORM(x) .platform = (x)
 #define GEN(x) \
-	.gen = (x), \
 	.graphics_ver = (x), \
 	.media_ver = (x), \
 	.display.ver = (x)
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index b8f7b996f140..8ab4fa6c7fdd 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -163,7 +163,6 @@ struct intel_device_info {
 	u8 graphics_ver;
 	u8 media_ver;
 
-	u8 gen;
 	u8 gt; /* GT number, 0 if undefined */
 	intel_engine_mask_t platform_engine_mask; /* Engines 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 0188f877cab2..2ffc763fe90d 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -162,7 +162,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)->graphics_ver = -1;
 
 	mkwrite_device_info(i915)->page_sizes =
 		I915_GTT_PAGE_SIZE_4K |
-- 
2.31.1

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

  parent reply	other threads:[~2021-04-08  0:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08  0:41 [Intel-gfx] [PATCH 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 01/12] drm/i915: rename display.version to display.ver Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 02/12] drm/i915: add macros for graphics and media versions Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 03/12] drm/i915/gt: replace gen use in intel_engine_cs Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 04/12] drm/i915/selftests: replace unused mask with simple version Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 05/12] drm/i915/selftests: eliminate use of gen_mask Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 06/12] drm/i915: finish removal " Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 07/12] drm/i915: eliminate remaining uses of intel_device_info->gen Lucas De Marchi
2021-04-08  0:41 ` Lucas De Marchi [this message]
2021-04-08  0:41 ` [Intel-gfx] [PATCH 09/12] drm/i915: add media and display versions to device_info print Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 10/12] drm/i915/display: use DISPLAY_VER() on remaining users Lucas De Marchi
2021-04-08  0:42 ` [Intel-gfx] [PATCH 12/12] drm/i915: split dgfx features from gen 12 Lucas De Marchi
2021-04-08  4:41 ` [Intel-gfx] [PATCH 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-08  4:52 Lucas De Marchi
2021-04-08  4:52 ` [Intel-gfx] [PATCH 08/12] drm/i915: finish removal of gen from intel_device_info Lucas De Marchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210408004200.984176-9-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.