Re: [PATCH 3/5] drm/xe/vf: Drop IS_VF_CCS_INIT_NEEDED macro

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

On Thu, Sep 04, 2025 at 09:29:15PM +0200, Michal Wajdeczko wrote:
> We only use this macro once and we can open-code it to explicitly
> show relevant conditions and avoid duplications.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_sriov_vf_ccs.c       | 6 +++++-
>  drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h | 6 ------
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> index 19786f64a7da..b01bb3660fb1 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
> @@ -15,6 +15,7 @@
>  #include "xe_migrate.h"
>  #include "xe_sa.h"
>  #include "xe_sriov_printk.h"
> +#include "xe_sriov_vf.h"
>  #include "xe_sriov_vf_ccs.h"
>  #include "xe_sriov_vf_ccs_types.h"
>  
> @@ -263,7 +264,10 @@ int xe_sriov_vf_ccs_init(struct xe_device *xe)
>  	u32 flags;
>  	int err;
>  
> -	if (!IS_VF_CCS_INIT_NEEDED(xe))
> +	xe_assert(xe, IS_SRIOV_VF(xe));
> +	xe_assert(xe, xe_sriov_vf_migration_supported(xe));
> +
> +	if (IS_DGFX(xe) || !xe_device_has_flat_ccs(xe))
>  		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 93435a6f4cb6..0df6b4130e7c 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> +++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h
> @@ -15,12 +15,6 @@
>  		___xe->sriov.vf.ccs.initialized; \
>  		})
>  
> -#define IS_VF_CCS_INIT_NEEDED(xe) ({\
> -		struct xe_device *___xe = (xe); \
> -		IS_SRIOV_VF(___xe) && !IS_DGFX(___xe) && \
> -		xe_device_has_flat_ccs(___xe) && GRAPHICS_VER(___xe) >= 20; \
> -		})
> -
>  enum xe_sriov_vf_ccs_rw_ctxs {
>  	XE_SRIOV_VF_CCS_READ_CTX,
>  	XE_SRIOV_VF_CCS_WRITE_CTX,
> -- 
> 2.47.1
>