diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-13 06:42:54 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-13 06:42:54 +0100 |
commit | b37333c8657cfece16b2fb0ba3fef2cb481a0a19 (patch) | |
tree | 9b7da4fb461d74f6c5fd02b872a695af30cad324 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | e7cd121cbf1bec05e50335f82d4aa7d8fa700538 (diff) | |
parent | 5bc55a333a2f7316b58edc7573e8e893f7acb532 (diff) |
Merge 6.13-rc7 into staging next
We need the gpib changes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d272d95dd5b2f..cd4fac1208342 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -417,6 +417,9 @@ bool amdgpu_device_supports_boco(struct drm_device *dev) { struct amdgpu_device *adev = drm_to_adev(dev); + if (!IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE)) + return false; + if (adev->has_pr3 || ((adev->flags & AMD_IS_PX) && amdgpu_is_atpx_hybrid())) return true; |