Skip to content

Commit 7b7b07c

Browse files
Tvrtko Ursulinlucasdemarchi
authored andcommitted
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: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250307111402.26577-5-tvrtko.ursulin@igalia.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> (cherry picked from commit c36e344) Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent 11ef40e commit 7b7b07c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ write_dpt_remapped(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs,
8282
static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb,
8383
const struct i915_gtt_view *view,
8484
struct i915_vma *vma,
85-
u64 physical_alignment)
85+
unsigned int alignment)
8686
{
8787
struct xe_device *xe = to_xe_device(fb->base.dev);
8888
struct xe_tile *tile0 = xe_device_get_root_tile(xe);
@@ -108,23 +108,23 @@ static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb,
108108
XE_BO_FLAG_VRAM0 |
109109
XE_BO_FLAG_GGTT |
110110
XE_BO_FLAG_PAGETABLE,
111-
physical_alignment);
111+
alignment);
112112
else
113113
dpt = xe_bo_create_pin_map_at_aligned(xe, tile0, NULL,
114114
dpt_size, ~0ull,
115115
ttm_bo_type_kernel,
116116
XE_BO_FLAG_STOLEN |
117117
XE_BO_FLAG_GGTT |
118118
XE_BO_FLAG_PAGETABLE,
119-
physical_alignment);
119+
alignment);
120120
if (IS_ERR(dpt))
121121
dpt = xe_bo_create_pin_map_at_aligned(xe, tile0, NULL,
122122
dpt_size, ~0ull,
123123
ttm_bo_type_kernel,
124124
XE_BO_FLAG_SYSTEM |
125125
XE_BO_FLAG_GGTT |
126126
XE_BO_FLAG_PAGETABLE,
127-
physical_alignment);
127+
alignment);
128128
if (IS_ERR(dpt))
129129
return PTR_ERR(dpt);
130130

@@ -194,7 +194,7 @@ write_ggtt_rotated(struct xe_bo *bo, struct xe_ggtt *ggtt, u32 *ggtt_ofs, u32 bo
194194
static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
195195
const struct i915_gtt_view *view,
196196
struct i915_vma *vma,
197-
u64 physical_alignment)
197+
unsigned int alignment)
198198
{
199199
struct drm_gem_object *obj = intel_fb_bo(&fb->base);
200200
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,
277277

278278
static struct i915_vma *__xe_pin_fb_vma(const struct intel_framebuffer *fb,
279279
const struct i915_gtt_view *view,
280-
u64 physical_alignment)
280+
unsigned int alignment)
281281
{
282282
struct drm_device *dev = fb->base.dev;
283283
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,
327327

328328
vma->bo = bo;
329329
if (intel_fb_uses_dpt(&fb->base))
330-
ret = __xe_pin_fb_vma_dpt(fb, view, vma, physical_alignment);
330+
ret = __xe_pin_fb_vma_dpt(fb, view, vma, alignment);
331331
else
332-
ret = __xe_pin_fb_vma_ggtt(fb, view, vma, physical_alignment);
332+
ret = __xe_pin_fb_vma_ggtt(fb, view, vma, alignment);
333333
if (ret)
334334
goto err_unpin;
335335

@@ -422,15 +422,15 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
422422
struct i915_vma *vma;
423423
struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
424424
struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);
425-
u64 phys_alignment = plane->min_alignment(plane, fb, 0);
425+
unsigned int alignment = plane->min_alignment(plane, fb, 0);
426426

427427
if (reuse_vma(new_plane_state, old_plane_state))
428428
return 0;
429429

430430
/* We reject creating !SCANOUT fb's, so this is weird.. */
431431
drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_FLAG_SCANOUT));
432432

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

435435
if (IS_ERR(vma))
436436
return PTR_ERR(vma);

0 commit comments

Comments
 (0)