diff options
| author | Greg Kroah-Hartman <[email protected]> | 2025-03-10 16:37:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2025-03-10 16:37:25 +0000 |
| commit | 993a47bd7b998156ffebc999617474c920dc9208 (patch) | |
| tree | ffac31b8a168fa4ea6d180a2c3ed8054e0fd29a4 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | driver core: faux: only create the device if probe() succeeds (diff) | |
| parent | Linux 6.14-rc6 (diff) | |
| download | kernel-993a47bd7b998156ffebc999617474c920dc9208.tar.gz kernel-993a47bd7b998156ffebc999617474c920dc9208.zip | |
Merge 6.14-rc6 into driver-core-next
We need the driver core fix in here as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index e6fa63f97687..0b712e25f710 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1638,6 +1638,13 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) if (amdgpu_sriov_vf(adev)) return 0; + /* resizing on Dell G5 SE platforms causes problems with runtime pm */ + if ((amdgpu_runtime_pm != 0) && + adev->pdev->vendor == PCI_VENDOR_ID_ATI && + adev->pdev->device == 0x731f && + adev->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL) + return 0; + /* PCI_EXT_CAP_ID_VNDR extended capability is located at 0x100 */ if (!pci_find_ext_capability(adev->pdev, PCI_EXT_CAP_ID_VNDR)) DRM_WARN("System can't access extended configuration space, please check!!\n"); |