amdgpu/pm/legacy: fix suspend/resume issues

commit 91dcc66b34beb72dde8412421bdc1b4cd40e4fb8 upstream.

resume and irq handler happily races in set_power_state()

* amdgpu_legacy_dpm_compute_clocks() needs lock
* protect irq work handler
* fix dpm_enabled usage

v2: fix clang build, integrate Lijo's comments (Alex)

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2524
Fixes: 3712e7a49459 ("drm/amd/pm: unified lock protections in amdgpu_dpm.c")
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> # on Oland PRO
Signed-off-by: chr[] <chris@rudorff.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ee3dc9e204d271c9c7a8d4d38a0bce4745d33e71)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
index e8b6989a40f35a7b29b4fe5c46c479665fc22e91..6b34a33d788f292126406c29fae10b1f3e1e22bb 100644 (file)
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
@@ -3043,6 +3043,7 @@ static int kv_dpm_hw_init(void *handle)
        if (!amdgpu_dpm)
                return 0;
 
+       mutex_lock(&adev->pm.mutex);
        kv_dpm_setup_asic(adev);
        ret = kv_dpm_enable(adev);
        if (ret)
@@ -3050,6 +3051,8 @@ static int kv_dpm_hw_init(void *handle)
        else
                adev->pm.dpm_enabled = true;
        amdgpu_legacy_dpm_compute_clocks(adev);
+       mutex_unlock(&adev->pm.mutex);
+
        return ret;
 }
 
@@ -3067,32 +3070,42 @@ static int kv_dpm_suspend(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       cancel_work_sync(&adev->pm.dpm.thermal.work);
+
        if (adev->pm.dpm_enabled) {
+               mutex_lock(&adev->pm.mutex);
+               adev->pm.dpm_enabled = false;
                /* disable dpm */
                kv_dpm_disable(adev);
                /* reset the power state */
                adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
+               mutex_unlock(&adev->pm.mutex);
        }
        return 0;
 }
 
 static int kv_dpm_resume(void *handle)
 {
-       int ret;
+       int ret = 0;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       if (adev->pm.dpm_enabled) {
+       if (!amdgpu_dpm)
+               return 0;
+
+       if (!adev->pm.dpm_enabled) {
+               mutex_lock(&adev->pm.mutex);
                /* asic init will reset to the boot state */
                kv_dpm_setup_asic(adev);
                ret = kv_dpm_enable(adev);
-               if (ret)
+               if (ret) {
                        adev->pm.dpm_enabled = false;
-               else
+               } else {
                        adev->pm.dpm_enabled = true;
-               if (adev->pm.dpm_enabled)
                        amdgpu_legacy_dpm_compute_clocks(adev);
+               }
+               mutex_unlock(&adev->pm.mutex);
        }
-       return 0;
+       return ret;
 }
 
 static bool kv_dpm_is_idle(void *handle)

diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
index e861355ebd75b9bb98365223eb76667a201dad7e..c7518b13e787955759f645d18c815452d96f7d77 100644 (file)
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
@@ -1009,9 +1009,12 @@ void amdgpu_dpm_thermal_work_handler(struct work_struct *work)
        enum amd_pm_state_type dpm_state = POWER_STATE_TYPE_INTERNAL_THERMAL;
        int temp, size = sizeof(temp);
 
-       if (!adev->pm.dpm_enabled)
-               return;
+       mutex_lock(&adev->pm.mutex);
 
+       if (!adev->pm.dpm_enabled) {
+               mutex_unlock(&adev->pm.mutex);
+               return;
+       }
        if (!pp_funcs->read_sensor(adev->powerplay.pp_handle,
                                   AMDGPU_PP_SENSOR_GPU_TEMP,
                                   (void *)&temp,
@@ -1033,4 +1036,5 @@ void amdgpu_dpm_thermal_work_handler(struct work_struct *work)
        adev->pm.dpm.state = dpm_state;
 
        amdgpu_legacy_dpm_compute_clocks(adev->powerplay.pp_handle);
+       mutex_unlock(&adev->pm.mutex);
 }

diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
index a1baa13ab2c263b54596efd054dea3f299ad5147..a5ad1b60597e61e072eeb201eb8955eabd2e306f 100644 (file)
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
@@ -7783,6 +7783,7 @@ static int si_dpm_hw_init(void *handle)
        if (!amdgpu_dpm)
                return 0;
 
+       mutex_lock(&adev->pm.mutex);
        si_dpm_setup_asic(adev);
        ret = si_dpm_enable(adev);
        if (ret)
@@ -7790,6 +7791,7 @@ static int si_dpm_hw_init(void *handle)
        else
                adev->pm.dpm_enabled = true;
        amdgpu_legacy_dpm_compute_clocks(adev);
+       mutex_unlock(&adev->pm.mutex);
        return ret;
 }
 
@@ -7807,32 +7809,44 @@ static int si_dpm_suspend(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       cancel_work_sync(&adev->pm.dpm.thermal.work);
+
        if (adev->pm.dpm_enabled) {
+               mutex_lock(&adev->pm.mutex);
+               adev->pm.dpm_enabled = false;
                /* disable dpm */
                si_dpm_disable(adev);
                /* reset the power state */
                adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
+               mutex_unlock(&adev->pm.mutex);
        }
+
        return 0;
 }
 
 static int si_dpm_resume(void *handle)
 {
-       int ret;
+       int ret = 0;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       if (adev->pm.dpm_enabled) {
+       if (!amdgpu_dpm)
+               return 0;
+
+       if (!adev->pm.dpm_enabled) {
                /* asic init will reset to the boot state */
+               mutex_lock(&adev->pm.mutex);
                si_dpm_setup_asic(adev);
                ret = si_dpm_enable(adev);
-               if (ret)
+               if (ret) {
                        adev->pm.dpm_enabled = false;
-               else
+               } else {
                        adev->pm.dpm_enabled = true;
-               if (adev->pm.dpm_enabled)
                        amdgpu_legacy_dpm_compute_clocks(adev);
+               }
+               mutex_unlock(&adev->pm.mutex);
        }
-       return 0;
+
+       return ret;
 }
 
 static bool si_dpm_is_idle(void *handle)