diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-09 17:32:50 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:13 -0400 |
commit | 5516ab86a873efc78fc356b0979294203f1cffb0 (patch) | |
tree | 21beab5c8a1ed7b06a749b363e1dfffe1fa2828e /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |
parent | db4448f78d5982997751120ca358c97a7f96e122 (diff) |
drm/amdgpu: don't grab dev->struct_mutex in pm functions
Similar to radeon, except that amdgpu doesn't even use struct_mutex to
protect anything like the shared z buffer (sane gpu architecture,
yay!). And the code already grabs the globa adev->ring_lock, so this
code can't race with itself. Which makes struct_mutex completely
redundnant. Remove it.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 25b329f4b2d9..efed11509f4a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -580,7 +580,6 @@ force: | |||
580 | amdgpu_dpm_print_power_state(adev, adev->pm.dpm.requested_ps); | 580 | amdgpu_dpm_print_power_state(adev, adev->pm.dpm.requested_ps); |
581 | } | 581 | } |
582 | 582 | ||
583 | mutex_lock(&adev->ddev->struct_mutex); | ||
584 | mutex_lock(&adev->ring_lock); | 583 | mutex_lock(&adev->ring_lock); |
585 | 584 | ||
586 | /* update whether vce is active */ | 585 | /* update whether vce is active */ |
@@ -628,7 +627,6 @@ force: | |||
628 | 627 | ||
629 | done: | 628 | done: |
630 | mutex_unlock(&adev->ring_lock); | 629 | mutex_unlock(&adev->ring_lock); |
631 | mutex_unlock(&adev->ddev->struct_mutex); | ||
632 | } | 630 | } |
633 | 631 | ||
634 | void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable) | 632 | void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable) |