diff options
| author | Evan Quan <evan.quan@amd.com> | 2019-07-12 13:18:16 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-07-17 13:34:30 -0500 |
| commit | f68ccf43acbc31751cff48d0ac1e5ff50d91a451 (patch) | |
| tree | 075b5aa79edae8ecfa28a896724193d5c99ab9ee /drivers/gpu/drm/amd | |
| parent | 7ef65bbd01fd59b749e8bd5b19d0c01e315fef8d (diff) | |
| download | linux-stable-f68ccf43acbc31751cff48d0ac1e5ff50d91a451.tar.gz linux-stable-f68ccf43acbc31751cff48d0ac1e5ff50d91a451.tar.bz2 linux-stable-f68ccf43acbc31751cff48d0ac1e5ff50d91a451.zip | |
drm/amd/powerplay: fix deadlock around smu_handle_task V2
As the lock was already held on the entrance to smu_handle_task.
- V2: lock in small granularity
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 193d53720d9b..397af9094a39 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -2996,13 +2996,10 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) } if (is_support_sw_smu(adev)) { - struct smu_context *smu = &adev->smu; struct smu_dpm_context *smu_dpm = &adev->smu.smu_dpm; - mutex_lock(&(smu->mutex)); smu_handle_task(&adev->smu, smu_dpm->dpm_level, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE); - mutex_unlock(&(smu->mutex)); } else { if (adev->powerplay.pp_funcs->dispatch_tasks) { if (!amdgpu_device_has_dc_support(adev)) { |