Prechádzať zdrojové kódy

drm/amdgpu/cz: force uvd clocks when sclks are forced

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher 9 rokov pred
rodič
commit
5f57642672
1 zmenil súbory, kde vykonal 24 pridanie a 0 odobranie
  1. 24 0
      drivers/gpu/drm/amd/amdgpu/cz_dpm.c

+ 24 - 0
drivers/gpu/drm/amd/amdgpu/cz_dpm.c

@@ -1971,23 +1971,47 @@ static int cz_dpm_force_dpm_level(struct amdgpu_device *adev,
 
 
 	switch (level) {
 	switch (level) {
 	case AMDGPU_DPM_FORCED_LEVEL_HIGH:
 	case AMDGPU_DPM_FORCED_LEVEL_HIGH:
+		/* sclk */
 		ret = cz_dpm_unforce_dpm_levels(adev);
 		ret = cz_dpm_unforce_dpm_levels(adev);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;
 		ret = cz_dpm_force_highest(adev);
 		ret = cz_dpm_force_highest(adev);
+		if (ret)
+			return ret;
+
+		/* uvd */
+		ret = cz_dpm_unforce_uvd_dpm_levels(adev);
+		if (ret)
+			return ret;
+		ret = cz_dpm_uvd_force_highest(adev);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;
 		break;
 		break;
 	case AMDGPU_DPM_FORCED_LEVEL_LOW:
 	case AMDGPU_DPM_FORCED_LEVEL_LOW:
+		/* sclk */
 		ret = cz_dpm_unforce_dpm_levels(adev);
 		ret = cz_dpm_unforce_dpm_levels(adev);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;
 		ret = cz_dpm_force_lowest(adev);
 		ret = cz_dpm_force_lowest(adev);
+		if (ret)
+			return ret;
+
+		/* uvd */
+		ret = cz_dpm_unforce_uvd_dpm_levels(adev);
+		if (ret)
+			return ret;
+		ret = cz_dpm_uvd_force_lowest(adev);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;
 		break;
 		break;
 	case AMDGPU_DPM_FORCED_LEVEL_AUTO:
 	case AMDGPU_DPM_FORCED_LEVEL_AUTO:
+		/* sclk */
 		ret = cz_dpm_unforce_dpm_levels(adev);
 		ret = cz_dpm_unforce_dpm_levels(adev);
+		if (ret)
+			return ret;
+
+		/* uvd */
+		ret = cz_dpm_unforce_uvd_dpm_levels(adev);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;
 		break;
 		break;