Commit 995b2e73 authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/radeon/kv_dpm: Strip out unused functions and their tables 



These haven't been used since the driver was upstreamed in 2013.

Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/radeon/kv_dpm.c:161:40: warning: ‘cpl_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:156:40: warning: ‘mc3_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:151:40: warning: ‘mc2_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:146:40: warning: ‘mc1_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:141:40: warning: ‘mc0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:136:40: warning: ‘sx0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:104:43: warning: ‘cpl_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:98:43: warning: ‘mc3_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:92:43: warning: ‘mc2_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:86:43: warning: ‘mc1_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:80:43: warning: ‘mc0_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
 drivers/gpu/drm/radeon/kv_dpm.c:67:43: warning: ‘sx_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4a347d80

drivers/gpu/drm/radeon/kv_dpm.c

+1 −204
Original line number Diff line number Diff line
@@ -64,105 +64,6 @@ extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev); 
extern void cik_update_cg(struct radeon_device *rdev,

			  u32 block, bool enable);



static const struct kv_lcac_config_values sx_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{  1,       4,        1    },

	{  2,       5,        1    },

	{  3,       4,        2    },

	{  4,       1,        1    },

	{  5,       5,        2    },

	{  6,       6,        1    },

	{  7,       9,        2    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_values mc0_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_values mc1_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_values mc2_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_values mc3_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_values cpl_local_cac_cfg_kv[] =

{

	{  0,       4,        1    },

	{  1,       4,        1    },

	{  2,       5,        1    },

	{  3,       4,        1    },

	{  4,       1,        1    },

	{  5,       5,        1    },

	{  6,       6,        1    },

	{  7,       9,        1    },

	{  8,       4,        1    },

	{  9,       2,        1    },

	{  10,      3,        1    },

	{  11,      6,        1    },

	{  12,      8,        2    },

	{  13,      1,        1    },

	{  14,      2,        1    },

	{  15,      3,        1    },

	{  16,      1,        1    },

	{  17,      4,        1    },

	{  18,      3,        1    },

	{  19,      1,        1    },

	{  20,      8,        1    },

	{  21,      5,        1    },

	{  22,      1,        1    },

	{  23,      1,        1    },

	{  24,      4,        1    },

	{  27,      6,        1    },

	{  28,      1,        1    },

	{ 0xffffffff }

};



static const struct kv_lcac_config_reg sx0_cac_config_reg[] =

{

	{ 0xc0400d00, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_lcac_config_reg mc0_cac_config_reg[] =

{

	{ 0xc0400d30, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_lcac_config_reg mc1_cac_config_reg[] =

{

	{ 0xc0400d3c, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_lcac_config_reg mc2_cac_config_reg[] =

{

	{ 0xc0400d48, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_lcac_config_reg mc3_cac_config_reg[] =

{

	{ 0xc0400d54, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_lcac_config_reg cpl_cac_config_reg[] =

{

	{ 0xc0400d80, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }

};



static const struct kv_pt_config_reg didt_config_kv[] =

{

	{ 0x10, 0x000000ff, 0, 0x0, KV_CONFIGREG_DIDT_IND },
@@ -254,32 +155,6 @@ static struct kv_power_info *kv_get_pi(struct radeon_device *rdev) 
	return pi;

}



#if 0

static void kv_program_local_cac_table(struct radeon_device *rdev,

				       const struct kv_lcac_config_values *local_cac_table,

				       const struct kv_lcac_config_reg *local_cac_reg)

{

	u32 i, count, data;

	const struct kv_lcac_config_values *values = local_cac_table;



	while (values->block_id != 0xffffffff) {

		count = values->signal_id;

		for (i = 0; i < count; i++) {

			data = ((values->block_id << local_cac_reg->block_shift) &

				local_cac_reg->block_mask);

			data |= ((i << local_cac_reg->signal_shift) &

				 local_cac_reg->signal_mask);

			data |= ((values->t << local_cac_reg->t_shift) &

				 local_cac_reg->t_mask);

			data |= ((1 << local_cac_reg->enable_shift) &

				 local_cac_reg->enable_mask);

			WREG32_SMC(local_cac_reg->cntl, data);

		}

		values++;

	}

}

#endif



static int kv_program_pt_config_registers(struct radeon_device *rdev,

					  const struct kv_pt_config_reg *cac_config_regs)

{
@@ -398,39 +273,6 @@ static int kv_enable_didt(struct radeon_device *rdev, bool enable) 
	return 0;

}



#if 0

static void kv_initialize_hardware_cac_manager(struct radeon_device *rdev)

{

	struct kv_power_info *pi = kv_get_pi(rdev);



	if (pi->caps_cac) {

		WREG32_SMC(LCAC_SX0_OVR_SEL, 0);

		WREG32_SMC(LCAC_SX0_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, sx_local_cac_cfg_kv, sx0_cac_config_reg);



		WREG32_SMC(LCAC_MC0_OVR_SEL, 0);

		WREG32_SMC(LCAC_MC0_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, mc0_local_cac_cfg_kv, mc0_cac_config_reg);



		WREG32_SMC(LCAC_MC1_OVR_SEL, 0);

		WREG32_SMC(LCAC_MC1_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, mc1_local_cac_cfg_kv, mc1_cac_config_reg);



		WREG32_SMC(LCAC_MC2_OVR_SEL, 0);

		WREG32_SMC(LCAC_MC2_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, mc2_local_cac_cfg_kv, mc2_cac_config_reg);



		WREG32_SMC(LCAC_MC3_OVR_SEL, 0);

		WREG32_SMC(LCAC_MC3_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, mc3_local_cac_cfg_kv, mc3_cac_config_reg);



		WREG32_SMC(LCAC_CPL_OVR_SEL, 0);

		WREG32_SMC(LCAC_CPL_OVR_VAL, 0);

		kv_program_local_cac_table(rdev, cpl_local_cac_cfg_kv, cpl_cac_config_reg);

	}

}

#endif



static int kv_enable_smc_cac(struct radeon_device *rdev, bool enable)

{

	struct kv_power_info *pi = kv_get_pi(rdev);
@@ -1227,9 +1069,7 @@ int kv_dpm_enable(struct radeon_device *rdev) 
		return ret;

	}

	kv_program_vc(rdev);

#if 0

	kv_initialize_hardware_cac_manager(rdev);

#endif



	kv_start_am(rdev);

	if (pi->enable_auto_thermal_throttling) {

		ret = kv_enable_auto_thermal_throttling(rdev);
@@ -1330,26 +1170,6 @@ void kv_dpm_disable(struct radeon_device *rdev) 
	kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);

}



#if 0

static int kv_write_smc_soft_register(struct radeon_device *rdev,

				      u16 reg_offset, u32 value)

{

	struct kv_power_info *pi = kv_get_pi(rdev);



	return kv_copy_bytes_to_smc(rdev, pi->soft_regs_start + reg_offset,

				    (u8 *)&value, sizeof(u16), pi->sram_end);

}



static int kv_read_smc_soft_register(struct radeon_device *rdev,

				     u16 reg_offset, u32 *value)

{

	struct kv_power_info *pi = kv_get_pi(rdev);



	return kv_read_smc_sram_dword(rdev, pi->soft_regs_start + reg_offset,

				      value, pi->sram_end);

}

#endif



static void kv_init_sclk_t(struct radeon_device *rdev)

{

	struct kv_power_info *pi = kv_get_pi(rdev);
@@ -1939,29 +1759,6 @@ void kv_dpm_setup_asic(struct radeon_device *rdev) 
	kv_init_sclk_t(rdev);

}



#if 0

void kv_dpm_reset_asic(struct radeon_device *rdev)

{

	struct kv_power_info *pi = kv_get_pi(rdev);



	if (rdev->family == CHIP_KABINI || rdev->family == CHIP_MULLINS) {

		kv_force_lowest_valid(rdev);

		kv_init_graphics_levels(rdev);

		kv_program_bootup_state(rdev);

		kv_upload_dpm_settings(rdev);

		kv_force_lowest_valid(rdev);

		kv_unforce_levels(rdev);

	} else {

		kv_init_graphics_levels(rdev);

		kv_program_bootup_state(rdev);

		kv_freeze_sclk_dpm(rdev, true);

		kv_upload_dpm_settings(rdev);

		kv_freeze_sclk_dpm(rdev, false);

		kv_set_enabled_level(rdev, pi->graphics_boot_level);

	}

}

#endif



//XXX use sumo_dpm_display_configuration_changed



static void kv_construct_max_power_limits_table(struct radeon_device *rdev,