Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae7617f0 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Allow optimized platform checks 



If we store the platform as a bitmask, and convert the
IS_PLATFORM macro to use it, we allow the compiler to
merge the IS_PLATFORM(a) || IS_PLATFORM(b) || ... checks
into a single conditional.

As a secondary benefit this saves almost 1k of text:

    text           data     bss     dec     hex filename
-1460254          60014    3656 1523924  1740d4 drivers/gpu/drm/i915/i915.ko
+1459260          60026    3656 1522942  173cfe drivers/gpu/drm/i915/i915.ko

v2: Removed the infamous -1.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170927164138.15474-1-tvrtko.ursulin@linux.intel.com
parent bd30ca2d

drivers/gpu/drm/i915/i915_drv.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -870,6 +870,10 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, 
	memcpy(device_info, match_info, sizeof(*device_info));

	memcpy(device_info, match_info, sizeof(*device_info));

	device_info->device_id = dev_priv->drm.pdev->device;

	device_info->device_id = dev_priv->drm.pdev->device;





	BUILD_BUG_ON(INTEL_MAX_PLATFORMS >

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

	BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * BITS_PER_BYTE);

	device_info->gen_mask = BIT(device_info->gen - 1);

	device_info->gen_mask = BIT(device_info->gen - 1);

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -861,6 +861,7 @@ struct intel_device_info { 
	u8 ring_mask; /* Rings supported by the HW */

	u8 ring_mask; /* Rings supported by the HW */





	enum intel_platform platform;

	enum intel_platform platform;

	u32 platform_mask;





	u32 display_mmio_offset;

	u32 display_mmio_offset;
@@ -2913,7 +2914,7 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define IS_REVID(p, since, until) \

#define IS_REVID(p, since, until) \

	(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))

	(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))





#define IS_PLATFORM(dev_priv, p) ((dev_priv)->info.platform == (p))

#define IS_PLATFORM(dev_priv, p) ((dev_priv)->info.platform_mask & BIT(p))





#define IS_I830(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I830)

#define IS_I830(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I830)

#define IS_I845G(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I845G)

#define IS_I845G(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I845G)