On Fri, 3 Nov 2023, Mario Limonciello wrote: > pci_is_thunderbolt_attached() only works for Intel TBT devices. Switch to > using dev_is_removable() to be able to detect USB4 devices as well.
Same here as with 1/9. -- i. > Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com> > --- > drivers/gpu/drm/radeon/radeon_device.c | 4 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_device.c > b/drivers/gpu/drm/radeon/radeon_device.c > index afbb3a80c0c6..ba0ca0694d18 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -1429,7 +1429,7 @@ int radeon_device_init(struct radeon_device *rdev, > > if (rdev->flags & RADEON_IS_PX) > runtime = true; > - if (!pci_is_thunderbolt_attached(rdev->pdev)) > + if (!dev_is_removable(&rdev->pdev->dev)) > vga_switcheroo_register_client(rdev->pdev, > &radeon_switcheroo_ops, runtime); > if (runtime) > @@ -1519,7 +1519,7 @@ void radeon_device_fini(struct radeon_device *rdev) > radeon_bo_evict_vram(rdev); > radeon_audio_component_fini(rdev); > radeon_fini(rdev); > - if (!pci_is_thunderbolt_attached(rdev->pdev)) > + if (!dev_is_removable(&rdev->pdev->dev)) > vga_switcheroo_unregister_client(rdev->pdev); > if (rdev->flags & RADEON_IS_PX) > vga_switcheroo_fini_domain_pm_ops(rdev->dev); > diff --git a/drivers/gpu/drm/radeon/radeon_kms.c > b/drivers/gpu/drm/radeon/radeon_kms.c > index a16590c6247f..ead912a58ab8 100644 > --- a/drivers/gpu/drm/radeon/radeon_kms.c > +++ b/drivers/gpu/drm/radeon/radeon_kms.c > @@ -138,7 +138,7 @@ int radeon_driver_load_kms(struct drm_device *dev, > unsigned long flags) > if ((radeon_runtime_pm != 0) && > radeon_has_atpx() && > ((flags & RADEON_IS_IGP) == 0) && > - !pci_is_thunderbolt_attached(pdev)) > + !dev_is_removable(&pdev->dev)) > flags |= RADEON_IS_PX; > > /* radeon_device_init should report only fatal error >
