Re: [PATCH 5/5] drm/xe/bo: Add xe_bo_has_valid_ccs_bb helper

["K V P, Satyanarayana" <satyanarayana.k.v.p@intel.com>]

On 05-09-2025 00:59, Michal Wajdeczko wrote:
> This will allow as to drop ugly IS_VF_CCS_BB_VALID macro.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_bo.h                 | 15 +++++++++++++++
>   drivers/gpu/drm/xe/xe_sriov_vf_ccs.c       |  2 +-
>   drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h |  8 --------
>   3 files changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h
> index 8cce413b5235..5e666fc2d00b 100644
> --- a/drivers/gpu/drm/xe/xe_bo.h
> +++ b/drivers/gpu/drm/xe/xe_bo.h
> @@ -315,6 +315,21 @@ static inline size_t xe_bo_ccs_pages_start(struct xe_bo *bo)
>   	return PAGE_ALIGN(xe_bo_size(bo));
>   }
>   
> +/**
> + * xe_bo_has_valid_ccs_bb - Check if CCS's BBs were setup for the BO.
> + * @bo: the &xe_bo to check
> + *
> + * The CCS's BBs should only be setup by the driver VF, but it is safe
> + * to call this function also by non-VF driver.
> + *
> + * Return: true iff the CCS's BBs are setup, false otherwise.
> + */
> +static inline bool xe_bo_has_valid_ccs_bb(struct xe_bo *bo)
> +{
> +	return bo->bb_ccs[XE_SRIOV_VF_CCS_READ_CTX] &&
> +	       bo->bb_ccs[XE_SRIOV_VF_CCS_WRITE_CTX];
> +}
> +
>   static inline bool xe_bo_has_pages(struct xe_bo *bo)
>   {
>   	if ((bo->ttm.ttm && ttm_tt_is_populated(bo->ttm.ttm)) ||
> diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> index 30aea958a337..eb8436e44ca4 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> @@ -363,7 +363,7 @@ int xe_sriov_vf_ccs_detach_bo(struct xe_bo *bo)
>   
>   	xe_assert(xe, IS_VF_CCS_READY(xe));
>   
> -	if (!IS_VF_CCS_BB_VALID(xe, bo))
> +	if (!xe_bo_has_valid_ccs_bb(bo))
>   		return 0;
>   
>   	for_each_ccs_rw_ctx(ctx_id) {
> 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 79092e386c4a..4d3c10907135 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> @@ -15,14 +15,6 @@ enum xe_sriov_vf_ccs_rw_ctxs {
>   	XE_SRIOV_VF_CCS_CTX_COUNT
>   };
>   
> -#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;
>   

LGTM.
Reviewed-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>