Re: [PATCH v3 01/25] drm/xe: Drop struct xe_migrate_pt_update argument from populate/clear vfuns

[Francois Dugast <francois.dugast@intel.com>]

On Fri, Feb 27, 2026 at 05:34:37PM -0800, Matthew Brost wrote:
> Remove the xe_migrate_pt_update argument from the populate and clear
> vfuns. This structure will not be available in run_job, where CPU binds
> will be implemented. The populate path no longer needs it, and the clear
> path already uses the VM field instead.
> 
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>

Reviewed-by: Francois Dugast <francois.dugast@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_migrate.c |  9 +++++----
>  drivers/gpu/drm/xe/xe_migrate.h | 12 +++++-------
>  drivers/gpu/drm/xe/xe_pt.c      | 12 +++++-------
>  3 files changed, 15 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
> index 8af6c347bea8..f7e3a044bd78 100644
> --- a/drivers/gpu/drm/xe/xe_migrate.c
> +++ b/drivers/gpu/drm/xe/xe_migrate.c
> @@ -1656,6 +1656,7 @@ static void write_pgtable(struct xe_tile *tile, struct xe_bb *bb, u64 ppgtt_ofs,
>  			  struct xe_migrate_pt_update *pt_update)
>  {
>  	const struct xe_migrate_pt_update_ops *ops = pt_update->ops;
> +	struct xe_vm *vm = pt_update->vops->vm;
>  	u32 chunk;
>  	u32 ofs = update->ofs, size = update->qwords;
>  
> @@ -1687,10 +1688,10 @@ static void write_pgtable(struct xe_tile *tile, struct xe_bb *bb, u64 ppgtt_ofs,
>  		bb->cs[bb->len++] = lower_32_bits(addr);
>  		bb->cs[bb->len++] = upper_32_bits(addr);
>  		if (pt_op->bind)
> -			ops->populate(pt_update, tile, NULL, bb->cs + bb->len,
> +			ops->populate(tile, NULL, bb->cs + bb->len,
>  				      ofs, chunk, update);
>  		else
> -			ops->clear(pt_update, tile, NULL, bb->cs + bb->len,
> +			ops->clear(vm, tile, NULL, bb->cs + bb->len,
>  				   ofs, chunk, update);
>  
>  		bb->len += chunk * 2;
> @@ -1747,12 +1748,12 @@ xe_migrate_update_pgtables_cpu(struct xe_migrate *m,
>  				&pt_op->entries[j];
>  
>  			if (pt_op->bind)
> -				ops->populate(pt_update, m->tile,
> +				ops->populate(m->tile,
>  					      &update->pt_bo->vmap, NULL,
>  					      update->ofs, update->qwords,
>  					      update);
>  			else
> -				ops->clear(pt_update, m->tile,
> +				ops->clear(vm, m->tile,
>  					   &update->pt_bo->vmap, NULL,
>  					   update->ofs, update->qwords, update);
>  		}
> diff --git a/drivers/gpu/drm/xe/xe_migrate.h b/drivers/gpu/drm/xe/xe_migrate.h
> index 1522afb37dcf..c3c0740f908d 100644
> --- a/drivers/gpu/drm/xe/xe_migrate.h
> +++ b/drivers/gpu/drm/xe/xe_migrate.h
> @@ -40,7 +40,6 @@ enum xe_migrate_copy_dir {
>  struct xe_migrate_pt_update_ops {
>  	/**
>  	 * @populate: Populate a command buffer or page-table with ptes.
> -	 * @pt_update: Embeddable callback argument.
>  	 * @tile: The tile for the current operation.
>  	 * @map: struct iosys_map into the memory to be populated.
>  	 * @pos: If @map is NULL, map into the memory to be populated.
> @@ -52,13 +51,12 @@ struct xe_migrate_pt_update_ops {
>  	 * page-table system to populate command buffers or shared
>  	 * page-tables with PTEs.
>  	 */
> -	void (*populate)(struct xe_migrate_pt_update *pt_update,
> -			 struct xe_tile *tile, struct iosys_map *map,
> +	void (*populate)(struct xe_tile *tile, struct iosys_map *map,
>  			 void *pos, u32 ofs, u32 num_qwords,
>  			 const struct xe_vm_pgtable_update *update);
>  	/**
>  	 * @clear: Clear a command buffer or page-table with ptes.
> -	 * @pt_update: Embeddable callback argument.
> +	 * @vm: VM being updated
>  	 * @tile: The tile for the current operation.
>  	 * @map: struct iosys_map into the memory to be populated.
>  	 * @pos: If @map is NULL, map into the memory to be populated.
> @@ -70,9 +68,9 @@ struct xe_migrate_pt_update_ops {
>  	 * page-table system to populate command buffers or shared
>  	 * page-tables with PTEs.
>  	 */
> -	void (*clear)(struct xe_migrate_pt_update *pt_update,
> -		      struct xe_tile *tile, struct iosys_map *map,
> -		      void *pos, u32 ofs, u32 num_qwords,
> +	void (*clear)(struct xe_vm *vm, struct xe_tile *tile,
> +		      struct iosys_map *map, void *pos, u32 ofs,
> +		      u32 num_qwords,
>  		      const struct xe_vm_pgtable_update *update);
>  
>  	/**
> diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
> index 13b355fadd58..99b15d37267f 100644
> --- a/drivers/gpu/drm/xe/xe_pt.c
> +++ b/drivers/gpu/drm/xe/xe_pt.c
> @@ -980,9 +980,8 @@ bool xe_pt_zap_ptes_range(struct xe_tile *tile, struct xe_vm *vm,
>  }
>  
>  static void
> -xe_vm_populate_pgtable(struct xe_migrate_pt_update *pt_update, struct xe_tile *tile,
> -		       struct iosys_map *map, void *data,
> -		       u32 qword_ofs, u32 num_qwords,
> +xe_vm_populate_pgtable(struct xe_tile *tile, struct iosys_map *map,
> +		       void *data, u32 qword_ofs, u32 num_qwords,
>  		       const struct xe_vm_pgtable_update *update)
>  {
>  	struct xe_pt_entry *ptes = update->pt_entries;
> @@ -1811,12 +1810,11 @@ static unsigned int xe_pt_stage_unbind(struct xe_tile *tile,
>  }
>  
>  static void
> -xe_migrate_clear_pgtable_callback(struct xe_migrate_pt_update *pt_update,
> -				  struct xe_tile *tile, struct iosys_map *map,
> -				  void *ptr, u32 qword_ofs, u32 num_qwords,
> +xe_migrate_clear_pgtable_callback(struct xe_vm *vm, struct xe_tile *tile,
> +				  struct iosys_map *map, void *ptr,
> +				  u32 qword_ofs, u32 num_qwords,
>  				  const struct xe_vm_pgtable_update *update)
>  {
> -	struct xe_vm *vm = pt_update->vops->vm;
>  	u64 empty = __xe_pt_empty_pte(tile, vm, update->pt->level);
>  	int i;
>  
> -- 
> 2.34.1
>