diff options
| author |   Mark Brown <broonie@kernel.org> | 2023-04-11 16:11:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-04-11 16:11:32 +0100 |
| commit | 53e59b5c4645236f0014d3cc5c24bc71ad3f6120 (patch) | |
| tree | 64c6005d6ffd496454fffb05b584ffb7011e12b4 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | regulator: qcom_smd: Add MP5496 S1 regulator (diff) | |
| parent | regulator: fan53555: Add support for RK860X (diff) | |
| download | wireguard-linux-53e59b5c4645236f0014d3cc5c24bc71ad3f6120.tar.xz wireguard-linux-53e59b5c4645236f0014d3cc5c24bc71ad3f6120.zip | |
Add support for Rockchip RK860X regulators
Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>:
This patch series introduces support for the Rockchip RK860X regulators,
while also providing a few fixes and improvements to the existing fan53555
driver.
RK8600/RK8601 are quite similar to the FAN53555 regulators.
RK8602/RK8603 are a bit different, having a wider output voltage
selection range, from 0.5 V to 1.5 V in 6.25 mV steps. They are used
in the Rock 5B board to power the ARM Cortex-A76 cores and the NPU.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index f5ffca24def4..ba5def374368 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2467,7 +2467,10 @@ static int amdgpu_pmops_freeze(struct device *dev) adev->in_s4 = false; if (r) return r; - return amdgpu_asic_reset(adev); + + if (amdgpu_acpi_should_gpu_reset(adev)) + return amdgpu_asic_reset(adev); + return 0; } static int amdgpu_pmops_thaw(struct device *dev) |