Commit e0f9e936 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: unshare the code for retrieving current clock frequency 



By moving them into asic specific file. Since they are really ASIC
specific.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5e6dc8fe

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c

+11 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,17 @@ static int arcturus_read_sensor(struct smu_context *smu, 
						(uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_MCLK:

		ret = arcturus_get_current_clk_freq_by_table(smu, SMU_UCLK, (uint32_t *)data);

		/* the output clock frequency in 10K unit */

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_SCLK:

		ret = arcturus_get_current_clk_freq_by_table(smu, SMU_GFXCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	default:

		ret = smu_v11_0_read_sensor(smu, sensor, data, size);

	}

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+10 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,16 @@ static int navi10_read_sensor(struct smu_context *smu, 
		ret = navi10_thermal_get_temperature(smu, sensor, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_MCLK:

		ret = navi10_get_current_clk_freq_by_table(smu, SMU_UCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_SCLK:

		ret = navi10_get_current_clk_freq_by_table(smu, SMU_GFXCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	default:

		ret = smu_v11_0_read_sensor(smu, sensor, data, size);

	}

drivers/gpu/drm/amd/powerplay/renoir_ppt.c

+10 −0
Original line number Diff line number Diff line
@@ -896,6 +896,16 @@ static int renoir_read_sensor(struct smu_context *smu, 
		ret = renoir_get_gpu_temperature(smu, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_MCLK:

		ret = renoir_get_current_clk_freq_by_table(smu, SMU_UCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_SCLK:

		ret = renoir_get_current_clk_freq_by_table(smu, SMU_GFXCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	default:

		ret = smu_v12_0_read_sensor(smu, sensor, data, size);

	}

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

+10 −0
Original line number Diff line number Diff line
@@ -1500,6 +1500,16 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu, 
		ret = sienna_cichlid_thermal_get_temperature(smu, sensor, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_MCLK:

		ret = sienna_cichlid_get_current_clk_freq_by_table(smu, SMU_UCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_SCLK:

		ret = sienna_cichlid_get_current_clk_freq_by_table(smu, SMU_GFXCLK, (uint32_t *)data);

		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	default:

		ret = smu_v11_0_read_sensor(smu, sensor, data, size);

	}

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+0 −8
Original line number Diff line number Diff line
@@ -1182,14 +1182,6 @@ int smu_v11_0_read_sensor(struct smu_context *smu, 
		return -EINVAL;



	switch (sensor) {

	case AMDGPU_PP_SENSOR_GFX_MCLK:

		ret = smu_v11_0_get_current_clk_freq(smu, SMU_UCLK, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_SCLK:

		ret = smu_v11_0_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDGFX:

		ret = smu_v11_0_get_gfx_vdd(smu, (uint32_t *)data);

		*size = 4;