[igt-dev] [PATCH i-g-t 2/3] lib/igt_device_scan: Xe get integrated/discrete card functions

[Kamil Konieczny]

Hi Marcin,

On 2023-08-25 at 13:19:12 +0000, Marcin Bernatowicz wrote:
> Xe functions to get integrated/discrete card.
> 
> Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz at linux.intel.com>
> ---
>  lib/igt_device_scan.c | 34 +++++++++++++++++++++++++---------
>  lib/igt_device_scan.h |  2 ++
>  2 files changed, 27 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
> index ae69ed09f..f8b8ca281 100644
> --- a/lib/igt_device_scan.c
> +++ b/lib/igt_device_scan.c
> @@ -769,25 +769,27 @@ __copy_dev_to_card(struct igt_device *dev, struct igt_device_card *card)
>   * Iterate over all igt_devices array and find first discrete/integrated card.
>   * card->pci_slot_name will be updated only if a card is found.
>   */
> -static bool __find_first_i915_card(struct igt_device_card *card, bool discrete)
> +static bool __find_first_intel_card(struct igt_device_card *card, bool want_discrete,
> +				    const char *drv_name)
>  {
>  	struct igt_device *dev;
> -	int cmp;
> +	int is_integrated;
>  
> +	igt_assert(drv_name);
>  	memset(card, 0, sizeof(*card));
>  
>  	igt_list_for_each_entry(dev, &igt_devs.all, link) {
>  
> -		if (!is_pci_subsystem(dev) || strcmp(dev->driver, "i915"))
> +		if (!is_pci_subsystem(dev) || strcmp(dev->driver, drv_name))
--------------------------------------------------------- ^^^^^^^^

May you extend this to cover also "intel" card here?
I mean both cases, i915 or xe.

>  			continue;
>  
> -		cmp = strncmp(dev->pci_slot_name, INTEGRATED_I915_GPU_PCI_ID,
> -			      PCI_SLOT_NAME_SIZE);
> +		is_integrated = !strncmp(dev->pci_slot_name, INTEGRATED_I915_GPU_PCI_ID,
> +					 PCI_SLOT_NAME_SIZE);
>  
> -		if (discrete && cmp) {
> +		if (want_discrete && !is_integrated) {
>  			__copy_dev_to_card(dev, card);
>  			return true;
> -		} else if (!discrete && !cmp) {
> +		} else if (!want_discrete && is_integrated) {
>  			__copy_dev_to_card(dev, card);
>  			return true;
>  		}
> @@ -800,14 +802,28 @@ bool igt_device_find_first_i915_discrete_card(struct igt_device_card *card)
>  {
>  	igt_assert(card);
>  
> -	return __find_first_i915_card(card, true);
> +	return __find_first_intel_card(card, true, "i915");
> +}
> +

Document all new public lib functions.

> +bool igt_device_find_first_xe_discrete_card(struct igt_device_card *card)
> +{
> +	igt_assert(card);
> +
> +	return __find_first_intel_card(card, true, "xe");
>  }
>  
>  bool igt_device_find_integrated_card(struct igt_device_card *card)
>  {
>  	igt_assert(card);
>  
> -	return __find_first_i915_card(card, false);
> +	return __find_first_intel_card(card, false, "i915");
> +}
> +

Same here.

Regards,
Kamil

> +bool igt_device_find_xe_integrated_card(struct igt_device_card *card)
> +{
> +	igt_assert(card);
> +
> +	return __find_first_intel_card(card, false, "xe");
>  }
>  
>  static struct igt_device *igt_device_from_syspath(const char *syspath)
> diff --git a/lib/igt_device_scan.h b/lib/igt_device_scan.h
> index e6b0f1b90..b8f6a843d 100644
> --- a/lib/igt_device_scan.h
> +++ b/lib/igt_device_scan.h
> @@ -87,6 +87,8 @@ bool igt_device_card_match_pci(const char *filter,
>  	struct igt_device_card *card);
>  bool igt_device_find_first_i915_discrete_card(struct igt_device_card *card);
>  bool igt_device_find_integrated_card(struct igt_device_card *card);
> +bool igt_device_find_first_xe_discrete_card(struct igt_device_card *card);
> +bool igt_device_find_xe_integrated_card(struct igt_device_card *card);
>  char *igt_device_get_pretty_name(struct igt_device_card *card, bool numeric);
>  int igt_open_card(struct igt_device_card *card);
>  int igt_open_render(struct igt_device_card *card);
> -- 
> 2.30.2
>