Skip to contentSkip to conversation

drm/amdgpu: double unlock in amdgpu_set_dpm_forced_performance_level()

PATCH New Dan Carpenter 1 participant 1 message Jan 4, 2016

Subsystems (3)
DRM drivers Kernel janitors Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 drm/amdgpu: double unlock in amdgpu_set_dpm_forced_performance_level()

We recently moved the locking around and accidentally introduced a double unlock bug.

Fixes 1b5708ffb103 ('drm/amdgpu: export amd_powerplay_func to amdgpu and other ip block')
Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +8 -9
index 3b78982..872e586 100644
@@ -147,8 +147,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
 	} else if (strncmp("auto", buf, strlen("auto")) == 0) {
 		level = AMDGPU_DPM_FORCED_LEVEL_AUTO;
 	} else {
-		count = -EINVAL;
-		goto fail;
+		return -EINVAL;
 	}
 
 	if (adev->pp_enabled)

@@ -157,18 +156,18 @@ 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;
-			goto fail;
+			goto unlock;
 		}
 		ret = amdgpu_dpm_force_performance_level(adev, level);
-		if (ret)
+		if (ret) {
 			count = -EINVAL;
-		else
-			adev->pm.dpm.forced_level = level;
+			goto unlock;
+		}
+		adev->pm.dpm.forced_level = level;
+
+unlock:
 		mutex_unlock(&adev->pm.mutex);
 	}
-fail:
-	mutex_unlock(&adev->pm.mutex);
-
 	return count;
 }