drm/amdgpu: fix locking in force performance level

alexdeucher · alexdeucher · commit 10f950f640e6 · 2016-02-22T11:30:50.000-05:00
Looks like a copy paste typo when we added powerplay
support.

Reviewed-by: Christian König &lt;christian.koenig@amd.com&gt;
Acked-by: Harry Wentland &lt;harry.wentland@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -157,6 +157,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
 		mutex_lock(&adev->pm.mutex);
 		if (adev->pm.dpm.thermal_active) {
 			count = -EINVAL;
+			mutex_unlock(&adev->pm.mutex);
 			goto fail;
 		}
 		ret = amdgpu_dpm_force_performance_level(adev, level);
@@ -167,8 +168,6 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
 		mutex_unlock(&adev->pm.mutex);
 	}
 fail:
-	mutex_unlock(&adev->pm.mutex);
-
 	return count;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,`
`157`	`157`	`mutex_lock(&adev->pm.mutex);`
`158`	`158`	`if (adev->pm.dpm.thermal_active) {`
`159`	`159`	`count = -EINVAL;`
	`160`	`+ mutex_unlock(&adev->pm.mutex);`
`160`	`161`	`goto fail;`
`161`	`162`	`}`
`162`	`163`	`ret = amdgpu_dpm_force_performance_level(adev, level);`
`@@ -167,8 +168,6 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,`
`167`	`168`	`mutex_unlock(&adev->pm.mutex);`
`168`	`169`	`}`
`169`	`170`	`fail:`
`170`		`- mutex_unlock(&adev->pm.mutex);`
`171`		`-`
`172`	`171`	`return count;`
`173`	`172`	`}`
`174`	`173`