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

Commit b7163936 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move a few more utility macros to i915_utils.h 



Now that we have split out a header file for simple macros (that maybe
we can promote into a core header), move a few macros across from
i915_drv.h

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170105164148.26875-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 121dfbb2

drivers/gpu/drm/i915/i915_drv.h

+0 −20
Original line number Diff line number Diff line
@@ -4026,24 +4026,4 @@ int remap_io_mapping(struct vm_area_struct *vma, 
		     unsigned long addr, unsigned long pfn, unsigned long size,

		     struct io_mapping *iomap);



#define ptr_mask_bits(ptr) ({						\

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

	(typeof(ptr))(__v & PAGE_MASK);					\

})



#define ptr_unpack_bits(ptr, bits) ({					\

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

	(bits) = __v & ~PAGE_MASK;					\

	(typeof(ptr))(__v & PAGE_MASK);					\

})



#define ptr_pack_bits(ptr, bits)					\

	((typeof(ptr))((unsigned long)(ptr) | (bits)))



#define fetch_and_zero(ptr) ({						\

	typeof(*ptr) __T = *(ptr);					\

	*(ptr) = (typeof(*ptr))0;					\

	__T;								\

})



#endif

drivers/gpu/drm/i915/i915_utils.h

+20 −0
Original line number Diff line number Diff line
@@ -41,4 +41,24 @@ 
#define overflows_type(x, T) \

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



#define ptr_mask_bits(ptr) ({						\

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

	(typeof(ptr))(__v & PAGE_MASK);					\

})



#define ptr_unpack_bits(ptr, bits) ({					\

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

	(bits) = __v & ~PAGE_MASK;					\

	(typeof(ptr))(__v & PAGE_MASK);					\

})



#define ptr_pack_bits(ptr, bits)					\

	((typeof(ptr))((unsigned long)(ptr) | (bits)))



#define fetch_and_zero(ptr) ({						\

	typeof(*ptr) __T = *(ptr);					\

	*(ptr) = (typeof(*ptr))0;					\

	__T;								\

})



#endif /* !__I915_UTILS_H */