drm/i915: Fix gtt_view asserts (ed11e415) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_gem_gtt.h

+4 −11

Original line number	Diff line number	Diff line
		@@ -167,29 +167,22 @@ struct intel_rotation_info {
		} plane[2];
		} __packed;

		static inline void assert_intel_rotation_info_is_packed(void)
		{
		BUILD_BUG_ON(sizeof(struct intel_rotation_info) != 8*sizeof(unsigned int));
		}

		struct intel_partial_info {
		u64 offset;
		unsigned int size;
		} __packed;

		static inline void assert_intel_partial_info_is_packed(void)
		{
		BUILD_BUG_ON(sizeof(struct intel_partial_info) != sizeof(u64) + sizeof(unsigned int));
		}

		enum i915_ggtt_view_type {
		I915_GGTT_VIEW_NORMAL = 0,
		I915_GGTT_VIEW_ROTATED = sizeof(struct intel_rotation_info),
		I915_GGTT_VIEW_PARTIAL = sizeof(struct intel_partial_info),
		};

		static inline void assert_i915_ggtt_view_type_is_unique(void)
		static inline void assert_i915_gem_gtt_types(void)
		{
		BUILD_BUG_ON(sizeof(struct intel_rotation_info) != 8*sizeof(unsigned int));
		BUILD_BUG_ON(sizeof(struct intel_partial_info) != sizeof(u64) + sizeof(unsigned int));

		/* As we encode the size of each branch inside the union into its type,
		* we have to be careful that each branch has a unique size.
		*/

+2 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,8 @@ i915_vma_compare(struct i915_vma *vma,
		if (cmp)
		return cmp;

		assert_i915_gem_gtt_types();

		/* ggtt_view.type also encodes its size so that we both distinguish
		* different views using it as a "type" and also use a compact (no
		* accessing of uninitialised padding bytes) memcmp without storing