drm/i915: be more solid in checking the alignment (2920516b) · Commits · 戴 / test

The alignment is u64, and yet is_power_of_2() assumes unsigned long, which might give different results between 32b and 64b kernel. Signed-off-by:

Matthew Auld <matthew.auld@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by:

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,8 @@ eb_validate_vma(struct i915_execbuffer *eb,
		if (unlikely(entry->flags & eb->invalid_flags))
		return -EINVAL;

		if (unlikely(entry->alignment && !is_power_of_2(entry->alignment)))
		if (unlikely(entry->alignment &&
		!is_power_of_2_u64(entry->alignment)))
		return -EINVAL;

		/*

+5 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,11 @@ static inline u64 ptr_to_u64(const void *ptr)
		__idx; \
		})

		static inline bool is_power_of_2_u64(u64 n)
		{
		return (n != 0 && ((n & (n - 1)) == 0));
		}

		static inline void __list_del_many(struct list_head *head,
		struct list_head *first)
		{