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

drm/amd/powerplay: drop unused code and wrapper around clock retrieving 



Clean code by dropping unnecessary ones.

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 e0f9e936

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

+6 −2
Original line number Diff line number Diff line
@@ -1212,8 +1212,13 @@ static int arcturus_read_sensor(struct smu_context *smu, 
		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDGFX:

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

		*size = 4;

		break;

	default:

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

		ret = -EOPNOTSUPP;

		break;

	}

	mutex_unlock(&smu->sensor_lock);
@@ -2566,7 +2571,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.set_default_dpm_table = arcturus_set_default_dpm_table,

	.populate_umd_state_clk = arcturus_populate_umd_state_clk,

	.get_thermal_temperature_range = arcturus_get_thermal_temperature_range,

	.get_current_clk_freq_by_table = arcturus_get_current_clk_freq_by_table,

	.print_clk_levels = arcturus_print_clk_levels,

	.force_clk_levels = arcturus_force_clk_levels,

	.read_sensor = arcturus_read_sensor,

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+0 −3
Original line number Diff line number Diff line
@@ -476,9 +476,6 @@ struct pptable_funcs { 
	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);

	int (*set_watermarks_table)(struct smu_context *smu, void *watermarks,

				    struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);

	int (*get_current_clk_freq_by_table)(struct smu_context *smu,

					     enum smu_clk_type clk_type,

					     uint32_t *value);

	int (*get_thermal_temperature_range)(struct smu_context *smu, struct smu_temperature_range *range);

	int (*get_uclk_dpm_states)(struct smu_context *smu, uint32_t *clocks_in_khz, uint32_t *num_states);

	int (*set_default_od_settings)(struct smu_context *smu);

drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h

+1 −7
Original line number Diff line number Diff line
@@ -197,19 +197,13 @@ int smu_v11_0_get_current_power_limit(struct smu_context *smu, 


int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n);



int smu_v11_0_get_current_clk_freq(struct smu_context *smu,

					  enum smu_clk_type clk_id,

					  uint32_t *value);



int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu);



int smu_v11_0_enable_thermal_alert(struct smu_context *smu);



int smu_v11_0_disable_thermal_alert(struct smu_context *smu);



int smu_v11_0_read_sensor(struct smu_context *smu,

				 enum amd_pp_sensors sensor,

				 void *data, uint32_t *size);

int smu_v11_0_get_gfx_vdd(struct smu_context *smu, uint32_t *value);



int smu_v11_0_set_min_deep_sleep_dcefclk(struct smu_context *smu, uint32_t clk);

drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h

+0 −8
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ int smu_v12_0_powergate_jpeg(struct smu_context *smu, bool gate); 


int smu_v12_0_set_gfx_cgpg(struct smu_context *smu, bool enable);



int smu_v12_0_read_sensor(struct smu_context *smu,

			  enum amd_pp_sensors sensor,

			  void *data, uint32_t *size);



uint32_t smu_v12_0_get_gfxoff_status(struct smu_context *smu);



int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable);
@@ -77,10 +73,6 @@ int smu_v12_0_set_default_dpm_tables(struct smu_context *smu); 
int smu_v12_0_get_enabled_mask(struct smu_context *smu,

				      uint32_t *feature_mask, uint32_t num);



int smu_v12_0_get_current_clk_freq(struct smu_context *smu,

					  enum smu_clk_type clk_id,

					  uint32_t *value);



int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type clk_type,

						 uint32_t *min, uint32_t *max);

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

+6 −2
Original line number Diff line number Diff line
@@ -1707,8 +1707,13 @@ static int navi10_read_sensor(struct smu_context *smu, 
		*(uint32_t *)data *= 100;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDGFX:

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

		*size = 4;

		break;

	default:

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

		ret = -EOPNOTSUPP;

		break;

	}

	mutex_unlock(&smu->sensor_lock);
@@ -2399,7 +2404,6 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.set_default_dpm_table = navi10_set_default_dpm_table,

	.dpm_set_vcn_enable = navi10_dpm_set_vcn_enable,

	.dpm_set_jpeg_enable = navi10_dpm_set_jpeg_enable,

	.get_current_clk_freq_by_table = navi10_get_current_clk_freq_by_table,

	.print_clk_levels = navi10_print_clk_levels,

	.force_clk_levels = navi10_force_clk_levels,

	.populate_umd_state_clk = navi10_populate_umd_state_clk,