[igt-dev] [PATCH i-g-t v3 1/6] lib/igt_device_scan: Migrate pci assignment

[Kamil Konieczny]

Hi Zbigniew,

On 2022-07-14 at 06:17:28 +0200, Zbigniew Kempczyński wrote:
> Core function of scanning drm devices is scan_drm_devices(). It goes
> over all drm subsystem devices acquiring pci (parent) device from udev
> during dedicated call for drm device.
> 
> Extending device selection to multi-gpu setup requires access to such
> machine or simulate udev calls (really replace current udev calls to
> say linker to use static versions of overridden udev functions).
> 
> Change migrates some core pci assignment to place where new igt_device is
> registered. It doesn't change code logic, only place where initialization
> is done making my simulation code happy.

Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

> 
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> ---
>  lib/igt_device_scan.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
> index 5d98381f06..83a488aa7c 100644
> --- a/lib/igt_device_scan.c
> +++ b/lib/igt_device_scan.c
> @@ -513,6 +513,11 @@ static struct igt_device *igt_device_new_from_udev(struct udev_device *dev)
>  	get_props(dev, idev);
>  	get_attrs(dev, idev);
>  
> +	if (is_pci_subsystem(idev)) {
> +		set_vendor_device(idev);
> +		set_pci_slot_name(idev);
> +	}
> +
>  	return idev;
>  }
>  
> @@ -671,10 +676,6 @@ static void update_or_add_parent(struct udev_device *dev,
>  	parent_idev = igt_device_find(subsystem, syspath);
>  	if (!parent_idev) {
>  		parent_idev = igt_device_new_from_udev(parent_dev);
> -		if (is_pci_subsystem(parent_idev)) {
> -			set_vendor_device(parent_idev);
> -			set_pci_slot_name(parent_idev);
> -		}
>  		igt_list_add_tail(&parent_idev->link, &igt_devs.all);
>  	}
>  	devname = udev_device_get_devnode(dev);
> @@ -804,8 +805,8 @@ static void scan_drm_devices(void)
>  		path = udev_list_entry_get_name(dev_list_entry);
>  		udev_dev = udev_device_new_from_syspath(udev, path);
>  		idev = igt_device_new_from_udev(udev_dev);
> -		update_or_add_parent(udev_dev, idev);
>  		igt_list_add_tail(&idev->link, &igt_devs.all);
> +		update_or_add_parent(udev_dev, idev);
>  
>  		udev_device_unref(udev_dev);
>  	}
> -- 
> 2.34.1
>