@@ -82,7 +82,7 @@ write_dpt_remapped(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs,
82
82
static int __xe_pin_fb_vma_dpt (const struct intel_framebuffer * fb ,
83
83
const struct i915_gtt_view * view ,
84
84
struct i915_vma * vma ,
85
- u64 physical_alignment )
85
+ unsigned int alignment )
86
86
{
87
87
struct xe_device * xe = to_xe_device (fb -> base .dev );
88
88
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,
108
108
XE_BO_FLAG_VRAM0 |
109
109
XE_BO_FLAG_GGTT |
110
110
XE_BO_FLAG_PAGETABLE ,
111
- physical_alignment );
111
+ alignment );
112
112
else
113
113
dpt = xe_bo_create_pin_map_at_aligned (xe , tile0 , NULL ,
114
114
dpt_size , ~0ull ,
115
115
ttm_bo_type_kernel ,
116
116
XE_BO_FLAG_STOLEN |
117
117
XE_BO_FLAG_GGTT |
118
118
XE_BO_FLAG_PAGETABLE ,
119
- physical_alignment );
119
+ alignment );
120
120
if (IS_ERR (dpt ))
121
121
dpt = xe_bo_create_pin_map_at_aligned (xe , tile0 , NULL ,
122
122
dpt_size , ~0ull ,
123
123
ttm_bo_type_kernel ,
124
124
XE_BO_FLAG_SYSTEM |
125
125
XE_BO_FLAG_GGTT |
126
126
XE_BO_FLAG_PAGETABLE ,
127
- physical_alignment );
127
+ alignment );
128
128
if (IS_ERR (dpt ))
129
129
return PTR_ERR (dpt );
130
130
@@ -194,7 +194,7 @@ write_ggtt_rotated(struct xe_bo *bo, struct xe_ggtt *ggtt, u32 *ggtt_ofs, u32 bo
194
194
static int __xe_pin_fb_vma_ggtt (const struct intel_framebuffer * fb ,
195
195
const struct i915_gtt_view * view ,
196
196
struct i915_vma * vma ,
197
- u64 physical_alignment )
197
+ unsigned int alignment )
198
198
{
199
199
struct drm_gem_object * obj = intel_fb_bo (& fb -> base );
200
200
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,
277
277
278
278
static struct i915_vma * __xe_pin_fb_vma (const struct intel_framebuffer * fb ,
279
279
const struct i915_gtt_view * view ,
280
- u64 physical_alignment )
280
+ unsigned int alignment )
281
281
{
282
282
struct drm_device * dev = fb -> base .dev ;
283
283
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,
327
327
328
328
vma -> bo = bo ;
329
329
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 );
331
331
else
332
- ret = __xe_pin_fb_vma_ggtt (fb , view , vma , physical_alignment );
332
+ ret = __xe_pin_fb_vma_ggtt (fb , view , vma , alignment );
333
333
if (ret )
334
334
goto err_unpin ;
335
335
@@ -422,15 +422,15 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
422
422
struct i915_vma * vma ;
423
423
struct intel_framebuffer * intel_fb = to_intel_framebuffer (fb );
424
424
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 );
426
426
427
427
if (reuse_vma (new_plane_state , old_plane_state ))
428
428
return 0 ;
429
429
430
430
/* We reject creating !SCANOUT fb's, so this is weird.. */
431
431
drm_WARN_ON (bo -> ttm .base .dev , !(bo -> flags & XE_BO_FLAG_SCANOUT ));
432
432
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 );
434
434
435
435
if (IS_ERR (vma ))
436
436
return PTR_ERR (vma );
0 commit comments