Re: [PATCH v6 2/3] drm/xe/vf: Attach and detach CCS copy commands with BO

[Matthew Brost <matthew.brost@intel.com>]

On Mon, Jun 09, 2025 at 06:00:40AM -0600, K V P, Satyanarayana wrote:
> Hi.
> > -----Original Message-----
> > From: Brost, Matthew <matthew.brost@intel.com>
> > Sent: Friday, June 6, 2025 11:08 PM
> > To: K V P, Satyanarayana <satyanarayana.k.v.p@intel.com>
> > Cc: intel-xe@lists.freedesktop.org; Wajdeczko, Michal
> > <Michal.Wajdeczko@intel.com>; Winiarski, Michal
> > <michal.winiarski@intel.com>; Lis, Tomasz <tomasz.lis@intel.com>; Auld,
> > Matthew <matthew.auld@intel.com>
> > Subject: Re: [PATCH v6 2/3] drm/xe/vf: Attach and detach CCS copy
> > commands with BO
> > 
> > On Fri, Jun 06, 2025 at 06:15:57PM +0530, Satyanarayana K V P wrote:
> > > Attach CCS read/write copy commands to BO for old and new mem types as
> > > NULL -> tt or system -> tt.
> > > Detach the CCS read/write copy commands from BO while deleting ttm bo
> > > from xe_ttm_bo_delete_mem_notify().
> > >
> > > Signed-off-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
> > > ---
> > > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> > > Cc: Michał Winiarski <michal.winiarski@intel.com>
> > > Cc: Tomasz Lis <tomasz.lis@intel.com>
> > > Cc: Matthew Brost <matthew.brost@intel.com>
> > > Cc: Matthew Auld <matthew.auld@intel.com>
> > >
> > > V5 -> V6:
> > > - Removed dead code from xe_migrate_ccs_rw_copy() function. (Matthew
> > Brost)
> > >
> > > V4 -> V5:
> > > - Create a list of BBs for the given BO and fixed memory leak while
> > >   detaching BOs. (Matthew Brost).
> > 
> > I'd still personally prefer a single BB per BO rather than having a
> > list. Unless I'm missing something, I think that would work and would be
> > cleaner. Any particular reason you went with a list of BB over a single
> > BB?
> > 
> If the provided size is more than max_mem_transfer_per_pass(), then the copy is divided into chunks.
> The max_mem_transfer_per_pass = MAX_CCS_LIMITED_TRANSFER = 4MB.

The only reason max_mem_transfer_per_pass() exists is so the migration
queue issues jobs that run in a reasonable amount of time and engine
which the queue runs on can be safely shared without migration queue
hogging the timeslices or in worst case getting a preemption timeout
causing a queue reset.

Do the save / restore queues get timesliced once execution starts? I
suspect not but you should follow up with the arch / GuC team on this.
Also you'd need to insert explict preemption points into the BBs if this
is a concern which this series is not doing.

> For buffer sizes bigger than 4MB, we get more BBs and so, created a list to track and free them.
> The Head of the list is stored in the BO, and list is parsed only when more BBs are available in the list.
> For 98% of the cases, only one BB was allocated when checked with 3D benchmark.

I understand what the code is doing - I'm asking for a justification of
using a list vs. a single BB allocation, see above.

If save / restore queues do not get timesliced, then refactor the code
for one BB per BO, IMO much cleaner.

If save / restore queues do get timesliced, then you need add explict
preemption points (MI_ARB_CHECK instruction) into each BB after each
copy.

Matt

> -Satya.
> > > - Fixed review comments (Matthew Brost & Matthew Auld).
> > > - Yet to cleanup xe_migrate_ccs_rw_copy() function.
> > >
> > > V3 -> V4:
> > > - Fixed issues reported by patchworks.
> > >
> > > V2 -> V3:
> > > - Attach and detach functions check for IS_VF_CCS_READY().
> > >
> > > V1 -> V2:
> > > - Fixed review comments.
> > > ---
> > >  drivers/gpu/drm/xe/xe_bb.c                 | 34 ++++++++
> > >  drivers/gpu/drm/xe/xe_bb.h                 |  3 +
> > >  drivers/gpu/drm/xe/xe_bb_types.h           |  1 +
> > >  drivers/gpu/drm/xe/xe_bo.c                 | 23 +++++
> > >  drivers/gpu/drm/xe/xe_bo_types.h           |  3 +
> > >  drivers/gpu/drm/xe/xe_migrate.c            | 98 ++++++++++++++++++++++
> > >  drivers/gpu/drm/xe/xe_migrate.h            |  4 +
> > >  drivers/gpu/drm/xe/xe_sriov_vf_ccs.c       | 77 +++++++++++++++++
> > >  drivers/gpu/drm/xe/xe_sriov_vf_ccs.h       |  3 +
> > >  drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h |  8 ++
> > >  10 files changed, 254 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/xe/xe_bb.c b/drivers/gpu/drm/xe/xe_bb.c
> > > index 9570672fce33..ee31556e00bc 100644
> > > --- a/drivers/gpu/drm/xe/xe_bb.c
> > > +++ b/drivers/gpu/drm/xe/xe_bb.c
> > > @@ -60,6 +60,40 @@ struct xe_bb *xe_bb_new(struct xe_gt *gt, u32
> > dwords, bool usm)
> > >  	return ERR_PTR(err);
> > >  }
> > >
> > > +struct xe_bb *xe_bb_ccs_new(struct xe_gt *gt, u32 dwords,
> > > +			    enum xe_sriov_vf_ccs_rw_ctxs ctx_id)
> > > +{
> > > +	struct xe_bb *bb = kmalloc(sizeof(*bb), GFP_KERNEL);
> > > +	struct xe_tile *tile = gt_to_tile(gt);
> > > +	struct xe_sa_manager *bb_pool;
> > > +	int err;
> > > +
> > > +	if (!bb)
> > > +		return ERR_PTR(-ENOMEM);
> > > +
> > > +	/*
> > > +	 * We need to allocate space for the requested number of dwords,
> > > +	 * one additional MI_BATCH_BUFFER_END dword, and additional
> > buffer
> > > +	 * space to accommodate the platform-specific hardware prefetch
> > > +	 * requirements.
> > > +	 */
> > > +	bb_pool = tile->sriov.vf.ccs[ctx_id].mem.ccs_bb_pool;
> > > +	bb->bo = xe_sa_bo_new(bb_pool, 4 * (dwords + 1) +
> > bb_prefetch(gt));
> > > +
> > > +	if (IS_ERR(bb->bo)) {
> > > +		err = PTR_ERR(bb->bo);
> > > +		goto err;
> > > +	}
> > > +
> > > +	bb->cs = xe_sa_bo_cpu_addr(bb->bo);
> > > +	bb->len = 0;
> > > +
> > > +	return bb;
> > > +err:
> > > +	kfree(bb);
> > > +	return ERR_PTR(err);
> > > +}
> > > +
> > >  static struct xe_sched_job *
> > >  __xe_bb_create_job(struct xe_exec_queue *q, struct xe_bb *bb, u64 *addr)
> > >  {
> > > diff --git a/drivers/gpu/drm/xe/xe_bb.h b/drivers/gpu/drm/xe/xe_bb.h
> > > index fafacd73dcc3..32c9c4c5d2be 100644
> > > --- a/drivers/gpu/drm/xe/xe_bb.h
> > > +++ b/drivers/gpu/drm/xe/xe_bb.h
> > > @@ -13,8 +13,11 @@ struct dma_fence;
> > >  struct xe_gt;
> > >  struct xe_exec_queue;
> > >  struct xe_sched_job;
> > > +enum xe_sriov_vf_ccs_rw_ctxs;
> > >
> > >  struct xe_bb *xe_bb_new(struct xe_gt *gt, u32 size, bool usm);
> > > +struct xe_bb *xe_bb_ccs_new(struct xe_gt *gt, u32 dwords,
> > > +			    enum xe_sriov_vf_ccs_rw_ctxs ctx_id);
> > >  struct xe_sched_job *xe_bb_create_job(struct xe_exec_queue *q,
> > >  				      struct xe_bb *bb);
> > >  struct xe_sched_job *xe_bb_create_migration_job(struct xe_exec_queue
> > *q,
> > > diff --git a/drivers/gpu/drm/xe/xe_bb_types.h
> > b/drivers/gpu/drm/xe/xe_bb_types.h
> > > index b7d30308cf90..b2358cc051ff 100644
> > > --- a/drivers/gpu/drm/xe/xe_bb_types.h
> > > +++ b/drivers/gpu/drm/xe/xe_bb_types.h
> > > @@ -12,6 +12,7 @@ struct drm_suballoc;
> > >
> > >  struct xe_bb {
> > >  	struct drm_suballoc *bo;
> > > +	struct list_head list;
> > >
> > >  	u32 *cs;
> > >  	u32 len; /* in dwords */
> > > diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> > > index 61d208c85281..b2ed5a36ab3d 100644
> > > --- a/drivers/gpu/drm/xe/xe_bo.c
> > > +++ b/drivers/gpu/drm/xe/xe_bo.c
> > > @@ -31,6 +31,7 @@
> > >  #include "xe_pxp.h"
> > >  #include "xe_res_cursor.h"
> > >  #include "xe_shrinker.h"
> > > +#include "xe_sriov_vf_ccs.h"
> > >  #include "xe_trace_bo.h"
> > >  #include "xe_ttm_stolen_mgr.h"
> > >  #include "xe_vm.h"
> > > @@ -948,6 +949,20 @@ static int xe_bo_move(struct ttm_buffer_object
> > *ttm_bo, bool evict,
> > >  	dma_fence_put(fence);
> > >  	xe_pm_runtime_put(xe);
> > >
> > > +	/*
> > > +	 * CCS meta data is migrated from TT -> SMEM. So, let us detach the
> > > +	 * BBs from BO as it is no longer needed.
> > > +	 */
> > > +	if (IS_VF_CCS_BB_VALID(xe, bo) && old_mem_type == XE_PL_TT &&
> > > +	    new_mem->mem_type == XE_PL_SYSTEM)
> > > +		xe_sriov_vf_ccs_detach_bo(bo);
> > > +
> > > +	if (IS_SRIOV_VF(xe) &&
> > > +	    ((move_lacks_source && new_mem->mem_type == XE_PL_TT) ||
> > > +	     (old_mem_type == XE_PL_SYSTEM && new_mem->mem_type ==
> > XE_PL_TT)) &&
> > > +	    handle_system_ccs)
> > > +		ret = xe_sriov_vf_ccs_attach_bo(bo);
> > > +
> > >  out:
> > >  	if ((!ttm_bo->resource || ttm_bo->resource->mem_type ==
> > XE_PL_SYSTEM) &&
> > >  	    ttm_bo->ttm) {
> > > @@ -958,6 +973,9 @@ static int xe_bo_move(struct ttm_buffer_object
> > *ttm_bo, bool evict,
> > >  		if (timeout < 0)
> > >  			ret = timeout;
> > >
> > > +		if (IS_VF_CCS_BB_VALID(xe, bo))
> > > +			xe_sriov_vf_ccs_detach_bo(bo);
> > > +
> > >  		xe_tt_unmap_sg(ttm_bo->ttm);
> > >  	}
> > >
> > > @@ -1482,9 +1500,14 @@ static void xe_ttm_bo_release_notify(struct
> > ttm_buffer_object *ttm_bo)
> > >
> > >  static void xe_ttm_bo_delete_mem_notify(struct ttm_buffer_object
> > *ttm_bo)
> > >  {
> > > +	struct xe_bo *bo = ttm_to_xe_bo(ttm_bo);
> > > +
> > >  	if (!xe_bo_is_xe_bo(ttm_bo))
> > >  		return;
> > >
> > > +	if (IS_VF_CCS_BB_VALID(ttm_to_xe_device(ttm_bo->bdev), bo))
> > > +		xe_sriov_vf_ccs_detach_bo(bo);
> > > +
> > >  	/*
> > >  	 * Object is idle and about to be destroyed. Release the
> > >  	 * dma-buf attachment.
> > > diff --git a/drivers/gpu/drm/xe/xe_bo_types.h
> > b/drivers/gpu/drm/xe/xe_bo_types.h
> > > index eb5e83c5f233..481b8e0d8ab1 100644
> > > --- a/drivers/gpu/drm/xe/xe_bo_types.h
> > > +++ b/drivers/gpu/drm/xe/xe_bo_types.h
> > > @@ -78,6 +78,9 @@ struct xe_bo {
> > >  	/** @ccs_cleared */
> > >  	bool ccs_cleared;
> > >
> > > +	/** @bb_ccs_rw: BB instructions of CCS read/write. Valid only for VF
> > */
> > > +	struct xe_bb *bb_ccs[XE_SRIOV_VF_CCS_RW_MAX_CTXS];
> > > +
> > >  	/**
> > >  	 * @cpu_caching: CPU caching mode. Currently only used for
> > userspace
> > >  	 * objects. Exceptions are system memory on DGFX, which is always
> > > diff --git a/drivers/gpu/drm/xe/xe_migrate.c
> > b/drivers/gpu/drm/xe/xe_migrate.c
> > > index 8f8e9fdfb2a8..d7f3009260ee 100644
> > > --- a/drivers/gpu/drm/xe/xe_migrate.c
> > > +++ b/drivers/gpu/drm/xe/xe_migrate.c
> > > @@ -940,6 +940,104 @@ struct dma_fence *xe_migrate_copy(struct
> > xe_migrate *m,
> > >  	return fence;
> > >  }
> > >
> > > +/**
> > > + * xe_migrate_ccs_rw_copy() - Copy content of TTM resources.
> > > + * @m: The migration context.
> > > + * @src_bo: The buffer object @src is currently bound to.
> > > + * @read_write : Creates BB commands for CCS read/write.
> > > + *
> > > + * Creates batch buffer instructions to copy CCS metadata from CCS pool to
> > > + * memory and vice versa.
> > > + *
> > > + * This function should only be called for IGPU.
> > > + *
> > > + * Return: 0 if successful, negative error code on failure.
> > > + */
> > > +int xe_migrate_ccs_rw_copy(struct xe_migrate *m,
> > > +			   struct xe_bo *src_bo,
> > > +			   int read_write)
> > 
> > s/int read_write/enum xe_sriov_vf_ccs_rw_ctxs
> > 
> > > +
> > > +{
> > > +	bool src_is_pltt = read_write == XE_SRIOV_VF_CCS_WRITE_CTX;
> > > +	bool dst_is_pltt = read_write == XE_SRIOV_VF_CCS_READ_CTX;
> > > +	struct ttm_resource *src = src_bo->ttm.resource;
> > > +	struct xe_gt *gt = m->tile->primary_gt;
> > > +	struct xe_device *xe = gt_to_xe(gt);
> > > +	struct xe_res_cursor src_it, ccs_it;
> > > +	u64 size = src_bo->size;
> > > +	u64 src_L0, src_L0_ofs;
> > > +	u32 src_L0_pt;
> > > +	int err;
> > > +
> > > +	xe_res_first_sg(xe_bo_sg(src_bo), 0, size, &src_it);
> > > +
> > > +	xe_res_first_sg(xe_bo_sg(src_bo), xe_bo_ccs_pages_start(src_bo),
> > > +			PAGE_ALIGN(xe_device_ccs_bytes(xe, size)),
> > > +			&ccs_it);
> > > +
> > > +	while (size) {
> > > +		u32 batch_size = 8; /* arb_clear() + MI_BATCH_BUFFER_END +
> > Flush + NOP */
> > > +		struct xe_bb *bb;
> > > +		u32 flush_flags = 0;
> > > +		u64 ccs_ofs, ccs_size;
> > > +		u32 ccs_pt;
> > > +
> > > +		u32 avail_pts = max_mem_transfer_per_pass(xe) /
> > LEVEL0_PAGE_TABLE_ENCODE_SIZE;
> > > +
> > > +		src_L0 = xe_migrate_res_sizes(m, &src_it);
> > > +
> > > +		batch_size += pte_update_size(m, false, src, &src_it, &src_L0,
> > > +					      &src_L0_ofs, &src_L0_pt, 0, 0,
> > > +					      avail_pts);
> > > +
> > > +		ccs_size = xe_device_ccs_bytes(xe, src_L0);
> > > +		batch_size += pte_update_size(m, 0, NULL, &ccs_it, &ccs_size,
> > &ccs_ofs,
> > > +					      &ccs_pt, 0, avail_pts, avail_pts);
> > > +		xe_assert(xe, IS_ALIGNED(ccs_it.start, PAGE_SIZE));
> > > +
> > > +		/* Add copy commands size here */
> > > +		batch_size += EMIT_COPY_CCS_DW;
> > > +
> > > +		bb = xe_bb_ccs_new(gt, batch_size, read_write);
> > > +		if (IS_ERR(bb)) {
> > > +			drm_dbg(&xe->drm, "BB allocation failed.\n");
> > 
> > s/drm_dbg/xe_sriov_err - I think.
> > 
> > > +			err = PTR_ERR(bb);
> > > +			goto err_ret;
> > > +		}
> > > +
> > > +		emit_pte(m, bb, src_L0_pt, false, true, &src_it, src_L0, src);
> > > +
> > > +		emit_pte(m, bb, ccs_pt, false, false, &ccs_it, ccs_size, src);
> > > +
> > > +		bb->cs[bb->len++] = MI_FLUSH_DW | MI_INVALIDATE_TLB |
> > MI_FLUSH_DW_OP_STOREDW |
> > > +					MI_FLUSH_IMM_DW;
> > > +		bb->cs[bb->len++] = MI_NOOP;
> > > +		bb->cs[bb->len++] = MI_NOOP;
> > > +
> > > +		flush_flags = xe_migrate_ccs_copy(m, bb, src_L0_ofs,
> > src_is_pltt,
> > > +						  src_L0_ofs, dst_is_pltt,
> > > +						  src_L0, ccs_ofs, true);
> > > +
> > > +		bb->cs[bb->len++] = MI_FLUSH_DW | MI_INVALIDATE_TLB |
> > MI_FLUSH_DW_OP_STOREDW |
> > > +					MI_FLUSH_IMM_DW | flush_flags;
> > > +		bb->cs[bb->len++] = MI_NOOP;
> > > +		bb->cs[bb->len++] = MI_NOOP;
> > > +
> > > +		if (size == src_bo->size) {
> > > +			src_bo->bb_ccs[read_write] = bb;
> > > +			INIT_LIST_HEAD(&src_bo->bb_ccs[read_write]->list);
> > > +		} else {
> > > +			list_add(&bb->list, &src_bo->bb_ccs[read_write]-
> > >list);
> > > +		}
> > > +
> > > +		size -= src_L0;
> > > +	}
> > > +	return 0;
> > > +
> > > +err_ret:
> > > +	return err;
> > > +}
> > > +
> > >  static void emit_clear_link_copy(struct xe_gt *gt, struct xe_bb *bb, u64
> > src_ofs,
> > >  				 u32 size, u32 pitch)
> > >  {
> > > diff --git a/drivers/gpu/drm/xe/xe_migrate.h
> > b/drivers/gpu/drm/xe/xe_migrate.h
> > > index fb9839c1bae0..ab5ebb44d2c9 100644
> > > --- a/drivers/gpu/drm/xe/xe_migrate.h
> > > +++ b/drivers/gpu/drm/xe/xe_migrate.h
> > > @@ -112,6 +112,10 @@ struct dma_fence *xe_migrate_copy(struct
> > xe_migrate *m,
> > >  				  struct ttm_resource *dst,
> > >  				  bool copy_only_ccs);
> > >
> > > +int xe_migrate_ccs_rw_copy(struct xe_migrate *m,
> > > +			   struct xe_bo *src_bo,
> > > +			   int read_write);
> > > +
> > >  int xe_migrate_access_memory(struct xe_migrate *m, struct xe_bo *bo,
> > >  			     unsigned long offset, void *buf, int len,
> > >  			     int write);
> > > diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> > b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> > > index 41fe1f59e0e9..4b5cfc0d421b 100644
> > > --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> > > +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> > > @@ -5,6 +5,7 @@
> > >
> > >  #include "instructions/xe_mi_commands.h"
> > >  #include "instructions/xe_gpu_commands.h"
> > > +#include "xe_bb.h"
> > >  #include "xe_bo.h"
> > >  #include "xe_device.h"
> > >  #include "xe_migrate.h"
> > > @@ -184,3 +185,79 @@ int xe_sriov_vf_ccs_init(struct xe_device *xe)
> > >  err_ret:
> > >  	return err;
> > >  }
> > > +
> > > +/**
> > > + * xe_sriov_vf_ccs_attach_bo - Insert CCS read write commands in the BO.
> > > + * @bo: the &buffer object to which batch buffer commands will be added.
> > > + *
> > > + * This function shall be called only by VF. It inserts the PTEs and copy
> > > + * command instructions in the BO by calling xe_migrate_ccs_rw_copy()
> > > + * function.
> > > + *
> > > + * Returns: 0 if successful, negative error code on failure.
> > > + */
> > > +int xe_sriov_vf_ccs_attach_bo(struct xe_bo *bo)
> > > +{
> > > +	struct xe_device *xe = xe_bo_device(bo);
> > > +	struct xe_migrate *migrate;
> > > +	struct xe_tile *tile;
> > > +	int tile_id, ctx_id;
> > 
> > ctx_id can be enum xe_sriov_vf_ccs_rw_ctxs
> > 
> > > +	struct xe_bb *bb;
> > > +	int err = 0;
> > > +
> > > +	if (!IS_VF_CCS_READY(xe))
> > > +		return 0;
> > > +
> > > +	for_each_tile(tile, xe, tile_id) {
> > > +		for_each_ccs_rw_ctx(ctx_id) {
> > > +			bb = bo->bb_ccs[ctx_id];
> > > +			if (bb)
> > > +				xe_sriov_err(xe, "Probable memory leak\n");
> > > +
> > > +			migrate = tile->sriov.vf.ccs[ctx_id].migrate;
> > > +			err = xe_migrate_ccs_rw_copy(migrate, bo, ctx_id);
> > > +		}
> > > +	}
> > > +	return err;
> > > +}
> > > +
> > > +/**
> > > + * xe_sriov_vf_ccs_detach_bo - Remove CCS read write commands from the
> > BO.
> > > + * @bo: the &buffer object from which batch buffer commands will be
> > removed.
> > > + *
> > > + * This function shall be called only by VF. It removes the PTEs and copy
> > > + * command instructions from the BO. Make sure to update the BB with
> > MI_NOOP
> > > + * before freeing.
> > > + *
> > > + * Returns: 0 if successful, negative error code on failure.
> > > + */
> > > +int xe_sriov_vf_ccs_detach_bo(struct xe_bo *bo)
> > > +{
> > > +	struct xe_device *xe = xe_bo_device(bo);
> > > +	struct xe_bb *bb, *pos, *temp;
> > > +	struct xe_tile *tile;
> > > +	int tile_id, ctx_id;
> > 
> > ctx_id can be enum xe_sriov_vf_ccs_rw_ctxs
> > 
> > Matt
> > 
> > > +
> > > +	if (!IS_VF_CCS_READY(xe))
> > > +		return 0;
> > > +
> > > +	for_each_tile(tile, xe, tile_id) {
> > > +		for_each_ccs_rw_ctx(ctx_id) {
> > > +			bb = bo->bb_ccs[ctx_id];
> > > +			if (!bb)
> > > +				continue;
> > > +
> > > +			list_for_each_entry_safe(pos, temp, &bb->list, list) {
> > > +				list_del(&pos->list);
> > > +				memset(pos->cs, MI_NOOP, pos->len *
> > sizeof(u32));
> > > +				xe_bb_free(pos, NULL);
> > > +			}
> > > +
> > > +			/* Free-up head BB */
> > > +			memset(bb->cs, MI_NOOP, bb->len * sizeof(u32));
> > > +			xe_bb_free(bb, NULL);
> > > +			bo->bb_ccs[ctx_id] = NULL;
> > > +		}
> > > +	}
> > > +	return 0;
> > > +}
> > > diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
> > b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
> > > index 5df9ba028d14..5d5e4bd25904 100644
> > > --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
> > > +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
> > > @@ -7,7 +7,10 @@
> > >  #define _XE_SRIOV_VF_CCS_H_
> > >
> > >  struct xe_device;
> > > +struct xe_bo;
> > >
> > >  int xe_sriov_vf_ccs_init(struct xe_device *xe);
> > > +int xe_sriov_vf_ccs_attach_bo(struct xe_bo *bo);
> > > +int xe_sriov_vf_ccs_detach_bo(struct xe_bo *bo);
> > >
> > >  #endif
> > > diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> > b/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> > > index f67f002c7a96..9545c5cfc2b1 100644
> > > --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> > > +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> > > @@ -28,6 +28,14 @@ enum xe_sriov_vf_ccs_rw_ctxs {
> > >  	XE_SRIOV_VF_CCS_RW_MAX_CTXS
> > >  };
> > >
> > > +#define IS_VF_CCS_BB_VALID(xe, bo) ({ \
> > > +		struct xe_device *___xe = (xe); \
> > > +		struct xe_bo *___bo = (bo); \
> > > +		IS_SRIOV_VF(___xe) && \
> > > +		___bo->bb_ccs[XE_SRIOV_VF_CCS_READ_CTX] && \
> > > +		___bo->bb_ccs[XE_SRIOV_VF_CCS_WRITE_CTX]; \
> > > +		})
> > > +
> > >  struct xe_migrate;
> > >  struct xe_sa_manager;
> > >
> > > --
> > > 2.43.0
> > >