diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-11-25 19:16:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-25 19:16:05 +0000 |
| commit | 5cd4d3886780bf9a846eada29a2aefe8bfcac027 (patch) | |
| tree | ea5cc9b11657912a1371932ad467a7a622e8010c /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | Nuvoton WPCM450 FIU SPI flash controller (diff) | |
| parent | Linux 6.1-rc4 (diff) | |
| download | wireguard-linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.tar.xz wireguard-linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.zip | |
Merge tag 'v6.1-rc4' into spi-6.2
Linux 6.1-rc4 which should get my CI working on RPi3s again.
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, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 3c9fecdd6b2f..bf2d50c8c92a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2201,7 +2201,8 @@ amdgpu_pci_remove(struct pci_dev *pdev) pm_runtime_forbid(dev->dev); } - if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) { + if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2) && + !amdgpu_sriov_vf(adev)) { bool need_to_reset_gpu = false; if (adev->gmc.xgmi.num_physical_nodes > 1) { |