From: Vitaly Prosyak <[email protected]> Added condition for pci_dev_is_disconnected and keeps drm_dev_is_unplugged to check whether we should unmap MMIO. Suggested by Alex regarding pci_dev_is_disconnected. Suggested by Christian keeping drm_dev_is_unplugged.
Signed-off-by: Vitaly Prosyak <[email protected]> Reviewed-by Alex Deucher <[email protected]> Reviewed-by Christian Koenig <[email protected]> Change-Id: I618c471cd398437d4ed6dec6d22be78e12683ae6 --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index a10b627c8357..d3568e1ded23 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -78,6 +78,8 @@ #include <drm/drm_drv.h> +#include "../../../../pci/pci.h" + MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin"); MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin"); MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin"); @@ -4031,7 +4033,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) amdgpu_gart_dummy_page_fini(adev); - if (drm_dev_is_unplugged(adev_to_drm(adev))) + if (pci_dev_is_disconnected(adev->pdev) && + drm_dev_is_unplugged(adev_to_drm(adev))) amdgpu_device_unmap_mmio(adev); } -- 2.25.1
