GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-06 22:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: finish removal of gen from intel_device_info

Browse source 
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.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
[Jani: Minor code comment change while applying.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-11-lucas.demarchi@intel.com
This commit is contained in:
Lucas De Marchi 2021-04-12 22:10:00 -07:00 • committed by Jani Nikula
parent 8802190f64
commit 7b36b7d3be
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_drv.h
View file

@ -1240,12 +1240,16 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
* Deprecated: this will be replaced by individual IP checks: * Deprecated: this will be replaced by individual IP checks:
* GRAPHICS_VER(), MEDIA_VER() and DISPLAY_VER() * 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_VER(), IS_MEDIA_VER() and IS_DISPLAY_VER() as * Deprecated: use IS_GRAPHICS_VER(), IS_MEDIA_VER() and IS_DISPLAY_VER() as
* appropriate. * appropriate.
*/ */
#define IS_GEN_RANGE(dev_priv, s, e) IS_GRAPHICS_VER(dev_priv, (s), (e)) #define IS_GEN_RANGE(dev_priv, s, e) IS_GRAPHICS_VER(dev_priv, (s), (e))
/*
* Deprecated: use GRAPHICS_VER(), MEDIA_VER() and DISPLAY_VER() as appropriate.
*/
#define IS_GEN(dev_priv, n) (GRAPHICS_VER(dev_priv) == (n))
#define GRAPHICS_VER(i915) (INTEL_INFO(i915)->graphics_ver) #define GRAPHICS_VER(i915) (INTEL_INFO(i915)->graphics_ver)
#define IS_GRAPHICS_VER(i915, from, until) \ #define IS_GRAPHICS_VER(i915, from, until) \
@ -1262,10 +1266,6 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
#define REVID_FOREVER 0xff #define REVID_FOREVER 0xff
#define INTEL_REVID(dev_priv) (to_pci_dev((dev_priv)->drm.dev)->revision) #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) #define HAS_DSB(dev_priv) (INTEL_INFO(dev_priv)->display.has_dsb)
/* /*

1
drivers/gpu/drm/i915/i915_pci.c
View file

@ -37,7 +37,6 @@
#define PLATFORM(x) .platform = (x) #define PLATFORM(x) .platform = (x)
#define GEN(x) \ #define GEN(x) \
.gen = (x), \
.graphics_ver = (x), \ .graphics_ver = (x), \
.media_ver = (x), \ .media_ver = (x), \
.display.ver = (x) .display.ver = (x)

1
drivers/gpu/drm/i915/intel_device_info.h
View file

@ -163,7 +163,6 @@ struct intel_device_info {
u8 graphics_ver; u8 graphics_ver;
u8 media_ver; u8 media_ver;
u8 gen;
u8 gt; /* GT number, 0 if undefined */ u8 gt; /* GT number, 0 if undefined */
intel_engine_mask_t platform_engine_mask; /* Engines supported by the HW */ intel_engine_mask_t platform_engine_mask; /* Engines supported by the HW */

2
drivers/gpu/drm/i915/selftests/mock_gem_device.c
View file

@ -162,7 +162,7 @@ struct drm_i915_private *mock_gem_device(void)
/* Using the global GTT may ask questions about KMS users, so prepare */ /* Using the global GTT may ask questions about KMS users, so prepare */
drm_mode_config_init(&i915->drm); 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 = mkwrite_device_info(i915)->page_sizes =
I915_GTT_PAGE_SIZE_4K | I915_GTT_PAGE_SIZE_4K |