From: Alex Deucher <alexander.deucher@xxxxxxx> commit 099bffc7cadff40bfab1517c3461c53a7a38a0d7 upstream. There was a quirk added to add a workaround for a Sapphire RX 5600 XT Pulse that didn't allow BAR resizing. However, the quirk caused a regression with runtime pm on Dell laptops using those chips, rather than narrowing the scope of the resizing quirk, add a quirk to prevent amdgpu from resizing the BAR on those Dell platforms unless runtime pm is disabled. v2: update commit message, add runpm check Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1707 Fixes: 907830b0fc9e ("PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse") Reviewed-by: Lijo Lazar <lijo.lazar@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> (cherry picked from commit 5235053f443cef4210606e5fb71f99b915a9723d) Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1635,6 +1635,13 @@ int amdgpu_device_resize_fb_bar(struct a 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"); Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-6.13/amdgpu-pm-legacy-fix-suspend-resume-issues.patch queue-6.13/drm-amdgpu-init-return-value-in-amdgpu_ttm_clear_buffer.patch queue-6.13/drm-amd-display-add-a-quirk-to-enable-edp0-on-dp1.patch queue-6.13/drm-amd-display-disable-psr-su-on-edp-panels.patch queue-6.13/drm-amdgpu-mes-keep-enforce-isolation-up-to-date.patch queue-6.13/drm-amdgpu-disable-bar-resize-on-dell-g5-se.patch queue-6.13/drm-amdkfd-preserve-cp_hqd_pq_control-on-update_mqd.patch queue-6.13/drm-amd-display-restore-edid-reading-from-a-given-i2.patch queue-6.13/drm-amd-display-fix-hpd-after-gpu-reset.patch queue-6.13/drm-amdgpu-gfx-only-call-mes-for-enforce-isolation-i.patch
