Commit 7b36b7d3 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Jani Nikula
Browse files

drm/i915: finish removal of gen from intel_device_info 



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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
[Jani: Minor code comment change while applying.]
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-11-lucas.demarchi@intel.com
parent 8802190f

drivers/gpu/drm/i915/i915_drv.h

+5 −5
Original line number Diff line number Diff line
@@ -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:

 * 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

 * appropriate.

 */

#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 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 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)



/*

drivers/gpu/drm/i915/i915_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#define PLATFORM(x) .platform = (x)

#define GEN(x) \

	.gen = (x), \

	.graphics_ver = (x), \

	.media_ver = (x), \

	.display.ver = (x)

drivers/gpu/drm/i915/intel_device_info.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/i915/selftests/mock_gem_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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 |