Commit cad4a0d6 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe/uapi: Kill tile_mask 



It is currently unused, so by the rules it cannot go upstream.
Also there was the desire to convert that to align with the
engine_class_instance selection, but the consensus on that one
is to remain with the global gt_id. So we are keeping the gt_id
there, not converting to a generic sched_group and also killing
this tile_mask and only using the default behavior of 0 that is
to create a mapping / page_table entry on every tile, similar
to what i915.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 37d078e5

drivers/gpu/drm/xe/xe_vm.c

+9 −31
Original line number Diff line number Diff line
@@ -870,7 +870,6 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, 
				    u64 start, u64 end,

				    bool read_only,

				    bool is_null,

				    u8 tile_mask,

				    u16 pat_index)

{

	struct xe_vma *vma;
@@ -903,12 +902,8 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, 
	if (is_null)

		vma->gpuva.flags |= DRM_GPUVA_SPARSE;



	if (tile_mask) {

		vma->tile_mask = tile_mask;

	} else {

	for_each_tile(tile, vm->xe, id)

		vma->tile_mask |= 0x1 << id;

	}



	if (GRAPHICS_VER(vm->xe) >= 20 || vm->xe->info.platform == XE_PVC)

		vma->gpuva.flags |= XE_VMA_ATOMIC_PTE_BIT;
@@ -2166,7 +2161,7 @@ static void print_op(struct xe_device *xe, struct drm_gpuva_op *op) 
static struct drm_gpuva_ops *

vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,

			 u64 bo_offset_or_userptr, u64 addr, u64 range,

			 u32 operation, u32 flags, u8 tile_mask,

			 u32 operation, u32 flags,

			 u32 prefetch_region, u16 pat_index)

{

	struct drm_gem_object *obj = bo ? &bo->ttm.base : NULL;
@@ -2229,7 +2224,6 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo, 
	drm_gpuva_for_each_op(__op, ops) {

		struct xe_vma_op *op = gpuva_op_to_vma_op(__op);



		op->tile_mask = tile_mask;

		if (__op->op == DRM_GPUVA_OP_MAP) {

			op->map.immediate =

				flags & DRM_XE_VM_BIND_FLAG_IMMEDIATE;
@@ -2248,8 +2242,7 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo, 
}



static struct xe_vma *new_vma(struct xe_vm *vm, struct drm_gpuva_op_map *op,

			      u8 tile_mask, bool read_only, bool is_null,

			      u16 pat_index)

			      bool read_only, bool is_null, u16 pat_index)

{

	struct xe_bo *bo = op->gem.obj ? gem_to_xe_bo(op->gem.obj) : NULL;

	struct xe_vma *vma;
@@ -2265,7 +2258,7 @@ static struct xe_vma *new_vma(struct xe_vm *vm, struct drm_gpuva_op_map *op, 
	vma = xe_vma_create(vm, bo, op->gem.offset,

			    op->va.addr, op->va.addr +

			    op->va.range - 1, read_only, is_null,

			    tile_mask, pat_index);

			    pat_index);

	if (bo)

		xe_bo_unlock(bo);
@@ -2409,8 +2402,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, 
		{

			struct xe_vma *vma;



			vma = new_vma(vm, &op->base.map,

				      op->tile_mask, op->map.read_only,

			vma = new_vma(vm, &op->base.map, op->map.read_only,

				      op->map.is_null, op->map.pat_index);

			if (IS_ERR(vma))

				return PTR_ERR(vma);
@@ -2435,8 +2427,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, 
					op->base.remap.unmap->va->flags &

					DRM_GPUVA_SPARSE;



				vma = new_vma(vm, op->base.remap.prev,

					      op->tile_mask, read_only,

				vma = new_vma(vm, op->base.remap.prev, read_only,

					      is_null, old->pat_index);

				if (IS_ERR(vma))

					return PTR_ERR(vma);
@@ -2469,8 +2460,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, 
					op->base.remap.unmap->va->flags &

					DRM_GPUVA_SPARSE;



				vma = new_vma(vm, op->base.remap.next,

					      op->tile_mask, read_only,

				vma = new_vma(vm, op->base.remap.next, read_only,

					      is_null, old->pat_index);

				if (IS_ERR(vma))

					return PTR_ERR(vma);
@@ -3024,16 +3014,6 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
			err = -EINVAL;

			goto release_vm_lock;

		}



		if (bind_ops[i].tile_mask) {

			u64 valid_tiles = BIT(xe->info.tile_count) - 1;



			if (XE_IOCTL_DBG(xe, bind_ops[i].tile_mask &

					 ~valid_tiles)) {

				err = -EINVAL;

				goto release_vm_lock;

			}

		}

	}



	bos = kzalloc(sizeof(*bos) * args->num_binds, GFP_KERNEL);
@@ -3126,14 +3106,12 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
		u32 op = bind_ops[i].op;

		u32 flags = bind_ops[i].flags;

		u64 obj_offset = bind_ops[i].obj_offset;

		u8 tile_mask = bind_ops[i].tile_mask;

		u32 prefetch_region = bind_ops[i].prefetch_mem_region_instance;

		u16 pat_index = bind_ops[i].pat_index;



		ops[i] = vm_bind_ioctl_ops_create(vm, bos[i], obj_offset,

						  addr, range, op, flags,

						  tile_mask, prefetch_region,

						  pat_index);

						  prefetch_region, pat_index);

		if (IS_ERR(ops[i])) {

			err = PTR_ERR(ops[i]);

			ops[i] = NULL;

drivers/gpu/drm/xe/xe_vm_types.h

+0 −2
Original line number Diff line number Diff line
@@ -400,8 +400,6 @@ struct xe_vma_op { 
	u32 num_syncs;

	/** @link: async operation link */

	struct list_head link;

	/** @tile_mask: gt mask for this operation */

	u8 tile_mask;

	/** @flags: operation flags */

	enum xe_vma_op_flags flags;

include/uapi/drm/xe_drm.h

+1 −7
Original line number Diff line number Diff line
@@ -750,12 +750,6 @@ struct drm_xe_vm_bind_op { 
	/** @addr: Address to operate on, MBZ for UNMAP_ALL */

	__u64 addr;



	/**

	 * @tile_mask: Mask for which tiles to create binds for, 0 == All tiles,

	 * only applies to creating new VMAs

	 */

	__u64 tile_mask;



#define DRM_XE_VM_BIND_OP_MAP		0x0

#define DRM_XE_VM_BIND_OP_UNMAP		0x1

#define DRM_XE_VM_BIND_OP_MAP_USERPTR	0x2
@@ -790,7 +784,7 @@ struct drm_xe_vm_bind_op { 
	__u32 prefetch_mem_region_instance;



	/** @reserved: Reserved */

	__u64 reserved[2];

	__u64 reserved[3];

};



struct drm_xe_vm_bind {