[PATCH i-g-t 1/2] lib/xe/oa: simplify device id array initialization

[Dixit, Ashutosh]

On Mon, 02 Sep 2024 06:49:06 -0700, Jani Nikula wrote:
>
> Stop abusing INTEL_VGA_DEVICE when we can simply define our own macro
> for initializing uint16_t arrays.

Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  lib/xe/xe_oa.c | 23 +++++++++--------------
>  1 file changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/lib/xe/xe_oa.c b/lib/xe/xe_oa.c
> index 4764ed1fcfb8..1bc2eeb0a11a 100644
> --- a/lib/xe/xe_oa.c
> +++ b/lib/xe/xe_oa.c
> @@ -112,16 +112,15 @@ unsupported_xe_oa_platform(struct intel_xe_perf *perf)
>	return NULL;
>  }
>
> +#define DEVID(_id) (_id)
> +
>  static bool
>  is_acm_gt1(const struct intel_xe_perf_devinfo *devinfo)
>  {
> -#undef INTEL_VGA_DEVICE
> -#define INTEL_VGA_DEVICE(_id, _info) _id
>	static const uint32_t devids[] = {
> -		XE_DG2_G11_IDS(INTEL_VGA_DEVICE, NULL),
> -		XE_ATS_M75_IDS(INTEL_VGA_DEVICE, NULL),
> +		XE_DG2_G11_IDS(DEVID),
> +		XE_ATS_M75_IDS(DEVID),
>	};
> -#undef INTEL_VGA_DEVICE
>	for (uint32_t i = 0; i < ARRAY_SIZE(devids); i++) {
>		if (devids[i] == devinfo->devid)
>			return true;
> @@ -133,12 +132,9 @@ is_acm_gt1(const struct intel_xe_perf_devinfo *devinfo)
>  static bool
>  is_acm_gt2(const struct intel_xe_perf_devinfo *devinfo)
>  {
> -#undef INTEL_VGA_DEVICE
> -#define INTEL_VGA_DEVICE(_id, _info) _id
>	static const uint32_t devids[] = {
> -		XE_DG2_G12_IDS(INTEL_VGA_DEVICE, NULL),
> +		XE_DG2_G12_IDS(DEVID),
>	};
> -#undef INTEL_VGA_DEVICE
>	for (uint32_t i = 0; i < ARRAY_SIZE(devids); i++) {
>		if (devids[i] == devinfo->devid)
>			return true;
> @@ -150,13 +146,10 @@ is_acm_gt2(const struct intel_xe_perf_devinfo *devinfo)
>  static bool
>  is_acm_gt3(const struct intel_xe_perf_devinfo *devinfo)
>  {
> -#undef INTEL_VGA_DEVICE
> -#define INTEL_VGA_DEVICE(_id, _info) _id
>	static const uint32_t devids[] = {
> -		XE_DG2_G10_IDS(INTEL_VGA_DEVICE, NULL),
> -		XE_ATS_M150_IDS(INTEL_VGA_DEVICE, NULL),
> +		XE_DG2_G10_IDS(DEVID),
> +		XE_ATS_M150_IDS(DEVID),
>	};
> -#undef INTEL_VGA_DEVICE
>	for (uint32_t i = 0; i < ARRAY_SIZE(devids); i++) {
>		if (devids[i] == devinfo->devid)
>			return true;
> @@ -165,6 +158,8 @@ is_acm_gt3(const struct intel_xe_perf_devinfo *devinfo)
>	return false;
>  }
>
> +#undef DEVID
> +
>  struct intel_xe_perf *
>  intel_xe_perf_for_devinfo(uint32_t device_id,
>			  uint32_t revision,
> --
> 2.39.2
>