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

Commit 74f6e183 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Convert to BITS_PER_TYPE 



In commit 9144d75e ("include/linux/bitops.h: introduce BITS_PER_TYPE"),
we made BITS_PER_TYPE available to all and now we can use the macro to
replace some open-coded computation of sizeof(T) * BITS_PER_BYTE.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180926104707.17410-1-chris@chris-wilson.co.uk
parent 2863b009

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1649,8 +1649,8 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
	device_info->device_id = pdev->device;



	BUILD_BUG_ON(INTEL_MAX_PLATFORMS >

		     sizeof(device_info->platform_mask) * BITS_PER_BYTE);

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

		     BITS_PER_TYPE(device_info->platform_mask));

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



	return i915;

}

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -5959,7 +5959,7 @@ void i915_gem_track_fb(struct drm_i915_gem_object *old, 
	 * the bits.

	 */

	BUILD_BUG_ON(INTEL_FRONTBUFFER_BITS_PER_PIPE * I915_MAX_PIPES >

		     sizeof(atomic_t) * BITS_PER_BYTE);

		     BITS_PER_TYPE(atomic_t));



	if (old) {

		WARN_ON(!(atomic_read(&old->frontbuffer_bits) & frontbuffer_bits));

drivers/gpu/drm/i915/i915_query.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv, 
	slice_length = sizeof(sseu->slice_mask);

	subslice_length = sseu->max_slices *

		DIV_ROUND_UP(sseu->max_subslices,

			     sizeof(sseu->subslice_mask[0]) * BITS_PER_BYTE);

			     BITS_PER_TYPE(sseu->subslice_mask[0]));

	eu_length = sseu->max_slices * sseu->max_subslices *

		DIV_ROUND_UP(sseu->max_eus_per_subslice, BITS_PER_BYTE);

drivers/gpu/drm/i915/i915_syncmap.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void i915_syncmap_init(struct i915_syncmap **root) 
{

	BUILD_BUG_ON_NOT_POWER_OF_2(KSYNCMAP);

	BUILD_BUG_ON_NOT_POWER_OF_2(SHIFT);

	BUILD_BUG_ON(KSYNCMAP > BITS_PER_BYTE * sizeof((*root)->bitmap));

	BUILD_BUG_ON(KSYNCMAP > BITS_PER_TYPE((*root)->bitmap));

	*root = NULL;

}

drivers/gpu/drm/i915/i915_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 


/* Note we don't consider signbits :| */

#define overflows_type(x, T) \

	(sizeof(x) > sizeof(T) && (x) >> (sizeof(T) * BITS_PER_BYTE))

	(sizeof(x) > sizeof(T) && (x) >> BITS_PER_TYPE(T))



#define ptr_mask_bits(ptr, n) ({					\

	unsigned long __v = (unsigned long)(ptr);			\