| Message ID | 20210521204122.762288-2-andrey.grodzovsky@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] drm/amdgpu: Rename flag which prevents HW access | expand |
On Fri, May 21, 2021 at 4:41 PM Andrey Grodzovsky <andrey.grodzovsky@amd.com> wrote: > > Problem: > When device goes into sleep state due to prolonged s/sleep state/runtime suspend/ > innactivity (e.g. BACO sleep) and then hot unplugged, inactivity > PCI core will try to wake up the device as part of > unplug process. Since the device is gone all HW > programming during rpm resume fails leading > to a bad SW state later during pci remove handling. > > Fix: > Use a flag we use for PCIe error recovery to avoid > accessing registres. This allows to succefully complete successfully > rpm resume sequence and finish pci remove. > > v2: Renamed HW access block flag > > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1081 > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> With the above comments fixed, the series is: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index d8db5929cdd9..b9d221fcb66d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -1555,6 +1555,11 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) > if (!adev->runpm) > return -EINVAL; > > + /* Avoids registers access if device is physically gone */ > + if (!pci_device_is_present(adev->pdev)) > + adev->no_hw_access = true; > + > + > if (amdgpu_device_supports_px(drm_dev)) { > drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > > -- > 2.25.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index d8db5929cdd9..b9d221fcb66d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1555,6 +1555,11 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) if (!adev->runpm) return -EINVAL; + /* Avoids registers access if device is physically gone */ + if (!pci_device_is_present(adev->pdev)) + adev->no_hw_access = true; + + if (amdgpu_device_supports_px(drm_dev)) { drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
Problem: When device goes into sleep state due to prolonged innactivity (e.g. BACO sleep) and then hot unplugged, PCI core will try to wake up the device as part of unplug process. Since the device is gone all HW programming during rpm resume fails leading to a bad SW state later during pci remove handling. Fix: Use a flag we use for PCIe error recovery to avoid accessing registres. This allows to succefully complete rpm resume sequence and finish pci remove. v2: Renamed HW access block flag Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1081 Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ 1 file changed, 5 insertions(+)