diff options
| author |   Dave Airlie <airlied@redhat.com> | 2022-02-28 14:57:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-28 14:57:14 +1000 |
| commit | 6c64ae228f0826859c56711ce133aff037d6205f (patch) | |
| tree | 831f7b3c5a4eb3a5ab932edb6ca27780a316e714 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | Merge tag 'mediatek-drm-next-5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next (diff) | |
| parent | Linux 5.17-rc6 (diff) | |
| download | linux-dev-6c64ae228f0826859c56711ce133aff037d6205f.tar.xz linux-dev-6c64ae228f0826859c56711ce133aff037d6205f.zip | |
Backmerge tag 'v5.17-rc6' into drm-next
This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index a0b5cf9a41cc..d406659ee273 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2008,6 +2008,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, return -ENODEV; } + if (amdgpu_aspm == -1 && !pcie_aspm_enabled(pdev)) + amdgpu_aspm = 0; + if (amdgpu_virtual_display || amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK)) supports_atomic = true; |