Commit 7b7b07c2 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Lucas De Marchi
Browse files

drm/xe: Use correct type width for alignment in fb pinning code 



Plane->min_alignment returns an unsigned int so lets use that in the whole
relevant call chain.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250307111402.26577-5-tvrtko.ursulin@igalia.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit c36e3442)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 11ef40eb

drivers/gpu/drm/xe/display/xe_fb_pin.c

+10 −10
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ write_dpt_remapped(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs, 
static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb,

			       const struct i915_gtt_view *view,

			       struct i915_vma *vma,

			       u64 physical_alignment)

			       unsigned int alignment)

{

	struct xe_device *xe = to_xe_device(fb->base.dev);

	struct xe_tile *tile0 = xe_device_get_root_tile(xe);
@@ -108,7 +108,7 @@ static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb, 
						      XE_BO_FLAG_VRAM0 |

						      XE_BO_FLAG_GGTT |

						      XE_BO_FLAG_PAGETABLE,

						      physical_alignment);

						      alignment);

	else

		dpt = xe_bo_create_pin_map_at_aligned(xe, tile0, NULL,

						      dpt_size,  ~0ull,
@@ -116,7 +116,7 @@ static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb, 
						      XE_BO_FLAG_STOLEN |

						      XE_BO_FLAG_GGTT |

						      XE_BO_FLAG_PAGETABLE,

						      physical_alignment);

						      alignment);

	if (IS_ERR(dpt))

		dpt = xe_bo_create_pin_map_at_aligned(xe, tile0, NULL,

						      dpt_size,  ~0ull,
@@ -124,7 +124,7 @@ static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb, 
						      XE_BO_FLAG_SYSTEM |

						      XE_BO_FLAG_GGTT |

						      XE_BO_FLAG_PAGETABLE,

						      physical_alignment);

						      alignment);

	if (IS_ERR(dpt))

		return PTR_ERR(dpt);
@@ -194,7 +194,7 @@ write_ggtt_rotated(struct xe_bo *bo, struct xe_ggtt *ggtt, u32 *ggtt_ofs, u32 bo 
static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,

				const struct i915_gtt_view *view,

				struct i915_vma *vma,

				u64 physical_alignment)

				unsigned int alignment)

{

	struct drm_gem_object *obj = intel_fb_bo(&fb->base);

	struct xe_bo *bo = gem_to_xe_bo(obj);
@@ -277,7 +277,7 @@ static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb, 


static struct i915_vma *__xe_pin_fb_vma(const struct intel_framebuffer *fb,

					const struct i915_gtt_view *view,

					u64 physical_alignment)

					unsigned int alignment)

{

	struct drm_device *dev = fb->base.dev;

	struct xe_device *xe = to_xe_device(dev);
@@ -327,9 +327,9 @@ static struct i915_vma *__xe_pin_fb_vma(const struct intel_framebuffer *fb, 


	vma->bo = bo;

	if (intel_fb_uses_dpt(&fb->base))

		ret = __xe_pin_fb_vma_dpt(fb, view, vma, physical_alignment);

		ret = __xe_pin_fb_vma_dpt(fb, view, vma, alignment);

	else

		ret = __xe_pin_fb_vma_ggtt(fb, view, vma,  physical_alignment);

		ret = __xe_pin_fb_vma_ggtt(fb, view, vma,  alignment);

	if (ret)

		goto err_unpin;
@@ -422,7 +422,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, 
	struct i915_vma *vma;

	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);

	struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);

	u64 phys_alignment = plane->min_alignment(plane, fb, 0);

	unsigned int alignment = plane->min_alignment(plane, fb, 0);



	if (reuse_vma(new_plane_state, old_plane_state))

		return 0;
@@ -430,7 +430,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, 
	/* We reject creating !SCANOUT fb's, so this is weird.. */

	drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_FLAG_SCANOUT));



	vma = __xe_pin_fb_vma(intel_fb, &new_plane_state->view.gtt, phys_alignment);

	vma = __xe_pin_fb_vma(intel_fb, &new_plane_state->view.gtt, alignment);



	if (IS_ERR(vma))

		return PTR_ERR(vma);