Commit 58e0d8a0 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Jani Nikula
Browse files

drm/i915: finish removal of gen_mask 



Now that it's not used anywhere, remove it from struct
intel_device_info. To allow a period in which code will be converted to
the new macro, keep IS_GEN_RANGE() around, just redefining it to use
the new fields. The size advantage from IS_GEN_RANGE() using a mask is
not that big as it has pretty limited use througout the driver:

   text    data     bss     dec     hex filename
2758497   95965    6496 2860958  2ba79e drivers/gpu/drm/i915/i915.ko.old
2758586   95953    6496 2861035  2ba7eb drivers/gpu/drm/i915/i915.ko.new

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-9-lucas.demarchi@intel.com
parent 33adf482

drivers/gpu/drm/i915/i915_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -768,8 +768,6 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
	memcpy(device_info, match_info, sizeof(*device_info));

	RUNTIME_INFO(i915)->device_id = pdev->device;



	BUG_ON(device_info->gen > BITS_PER_TYPE(device_info->gen_mask));



	return i915;

}

drivers/gpu/drm/i915/i915_drv.h

+5 −9
Original line number Diff line number Diff line
@@ -1241,6 +1241,11 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) 
 * GRAPHICS_VER(), MEDIA_VER() and DISPLAY_VER()

 */

#define INTEL_GEN(dev_priv)		(INTEL_INFO(dev_priv)->gen)

/*

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



#define GRAPHICS_VER(i915)		(INTEL_INFO(i915)->graphics_ver)

#define IS_GRAPHICS_VER(i915, from, until) \
@@ -1257,15 +1262,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 INTEL_GEN_MASK(s, e) ( \

	BUILD_BUG_ON_ZERO(!__builtin_constant_p(s)) + \

	BUILD_BUG_ON_ZERO(!__builtin_constant_p(e)) + \

	GENMASK((e) - 1, (s) - 1))



/* Returns true if Gen is in inclusive range [Start, End] */

#define IS_GEN_RANGE(dev_priv, s, e) \

	(!!(INTEL_INFO(dev_priv)->gen_mask & INTEL_GEN_MASK((s), (e))))



#define IS_GEN(dev_priv, n) \

	(BUILD_BUG_ON_ZERO(!__builtin_constant_p(n)) + \

	 INTEL_INFO(dev_priv)->gen == (n))

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_mask = BIT((x) - 1), \

	.gen = (x), \

	.graphics_ver = (x), \

	.media_ver = (x), \

drivers/gpu/drm/i915/intel_device_info.h

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ enum intel_ppgtt_type { 
	func(supports_tv);



struct intel_device_info {

	u16 gen_mask;



	u8 graphics_ver;

	u8 media_ver;