aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si_dpm.c
diff options
context:
space:
mode:
authorJérome Glisse <jglisse@redhat.com>2016-03-16 07:56:45 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-03-16 18:08:06 -0400
commit3cf8bb1ad1b8266ae12a0fbdfa79cdbdc2168a3f (patch)
treededf21c49960f51449ba4c55340a2410aa48dc6e /drivers/gpu/drm/radeon/si_dpm.c
parent60123300db80b17251b4de5e98c63e288c6f7b46 (diff)
drm/radeon: fix indentation.
I hate doing this but it hurts my eyes to go over code that does not comply with indentation rules. Only thing that is not only space change is in atom.c all other files are space indentation issues. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Jérôme Glisse <jglisse@redhat.com> Cc: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si_dpm.c')
-rw-r--r--drivers/gpu/drm/radeon/si_dpm.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index a82b891ae1fe..cb75ab72098a 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -499,7 +499,7 @@ static const struct si_cac_config_reg lcac_pitcairn[] =
499 499
500static const struct si_cac_config_reg cac_override_pitcairn[] = 500static const struct si_cac_config_reg cac_override_pitcairn[] =
501{ 501{
502 { 0xFFFFFFFF } 502 { 0xFFFFFFFF }
503}; 503};
504 504
505static const struct si_powertune_data powertune_data_pitcairn = 505static const struct si_powertune_data powertune_data_pitcairn =
@@ -991,7 +991,7 @@ static const struct si_cac_config_reg lcac_cape_verde[] =
991 991
992static const struct si_cac_config_reg cac_override_cape_verde[] = 992static const struct si_cac_config_reg cac_override_cape_verde[] =
993{ 993{
994 { 0xFFFFFFFF } 994 { 0xFFFFFFFF }
995}; 995};
996 996
997static const struct si_powertune_data powertune_data_cape_verde = 997static const struct si_powertune_data powertune_data_cape_verde =
@@ -1762,9 +1762,9 @@ static void si_fan_ctrl_set_default_mode(struct radeon_device *rdev);
1762 1762
1763static struct si_power_info *si_get_pi(struct radeon_device *rdev) 1763static struct si_power_info *si_get_pi(struct radeon_device *rdev)
1764{ 1764{
1765 struct si_power_info *pi = rdev->pm.dpm.priv; 1765 struct si_power_info *pi = rdev->pm.dpm.priv;
1766 1766
1767 return pi; 1767 return pi;
1768} 1768}
1769 1769
1770static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coeffients *coeff, 1770static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coeffients *coeff,
@@ -3150,9 +3150,9 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
3150 } 3150 }
3151 } 3151 }
3152 3152
3153 for (i = 0; i < ps->performance_level_count; i++) 3153 for (i = 0; i < ps->performance_level_count; i++)
3154 btc_adjust_clock_combinations(rdev, max_limits, 3154 btc_adjust_clock_combinations(rdev, max_limits,
3155 &ps->performance_levels[i]); 3155 &ps->performance_levels[i]);
3156 3156
3157 for (i = 0; i < ps->performance_level_count; i++) { 3157 for (i = 0; i < ps->performance_level_count; i++) {
3158 if (ps->performance_levels[i].vddc < min_vce_voltage) 3158 if (ps->performance_levels[i].vddc < min_vce_voltage)
@@ -3291,7 +3291,7 @@ static void si_set_dpm_event_sources(struct radeon_device *rdev, u32 sources)
3291 case 0: 3291 case 0:
3292 default: 3292 default:
3293 want_thermal_protection = false; 3293 want_thermal_protection = false;
3294 break; 3294 break;
3295 case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL): 3295 case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL):
3296 want_thermal_protection = true; 3296 want_thermal_protection = true;
3297 dpm_event_src = RADEON_DPM_EVENT_SRC_DIGITAL; 3297 dpm_event_src = RADEON_DPM_EVENT_SRC_DIGITAL;
@@ -3493,7 +3493,7 @@ static int si_process_firmware_header(struct radeon_device *rdev)
3493 if (ret) 3493 if (ret)
3494 return ret; 3494 return ret;
3495 3495
3496 si_pi->state_table_start = tmp; 3496 si_pi->state_table_start = tmp;
3497 3497
3498 ret = si_read_smc_sram_dword(rdev, 3498 ret = si_read_smc_sram_dword(rdev,
3499 SISLANDS_SMC_FIRMWARE_HEADER_LOCATION + 3499 SISLANDS_SMC_FIRMWARE_HEADER_LOCATION +
@@ -3652,7 +3652,7 @@ static void si_program_response_times(struct radeon_device *rdev)
3652 si_write_smc_soft_register(rdev, SI_SMC_SOFT_REGISTER_mvdd_chg_time, 1); 3652 si_write_smc_soft_register(rdev, SI_SMC_SOFT_REGISTER_mvdd_chg_time, 1);
3653 3653
3654 voltage_response_time = (u32)rdev->pm.dpm.voltage_response_time; 3654 voltage_response_time = (u32)rdev->pm.dpm.voltage_response_time;
3655 backbias_response_time = (u32)rdev->pm.dpm.backbias_response_time; 3655 backbias_response_time = (u32)rdev->pm.dpm.backbias_response_time;
3656 3656
3657 if (voltage_response_time == 0) 3657 if (voltage_response_time == 0)
3658 voltage_response_time = 1000; 3658 voltage_response_time = 1000;
@@ -3760,7 +3760,7 @@ static void si_setup_bsp(struct radeon_device *rdev)
3760 &pi->pbsu); 3760 &pi->pbsu);
3761 3761
3762 3762
3763 pi->dsp = BSP(pi->bsp) | BSU(pi->bsu); 3763 pi->dsp = BSP(pi->bsp) | BSU(pi->bsu);
3764 pi->psp = BSP(pi->pbsp) | BSU(pi->pbsu); 3764 pi->psp = BSP(pi->pbsp) | BSU(pi->pbsu);
3765 3765
3766 WREG32(CG_BSP, pi->dsp); 3766 WREG32(CG_BSP, pi->dsp);
@@ -4308,7 +4308,7 @@ static int si_populate_memory_timing_parameters(struct radeon_device *rdev,
4308 4308
4309 radeon_atom_set_engine_dram_timings(rdev, 4309 radeon_atom_set_engine_dram_timings(rdev,
4310 pl->sclk, 4310 pl->sclk,
4311 pl->mclk); 4311 pl->mclk);
4312 4312
4313 dram_timing = RREG32(MC_ARB_DRAM_TIMING); 4313 dram_timing = RREG32(MC_ARB_DRAM_TIMING);
4314 dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2); 4314 dram_timing2 = RREG32(MC_ARB_DRAM_TIMING2);
@@ -4343,7 +4343,7 @@ static int si_do_program_memory_timing_parameters(struct radeon_device *rdev,
4343 si_pi->sram_end); 4343 si_pi->sram_end);
4344 if (ret) 4344 if (ret)
4345 break; 4345 break;
4346 } 4346 }
4347 4347
4348 return ret; 4348 return ret;
4349} 4349}
@@ -4821,9 +4821,9 @@ static int si_calculate_sclk_params(struct radeon_device *rdev,
4821 spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK; 4821 spll_func_cntl_2 &= ~SCLK_MUX_SEL_MASK;
4822 spll_func_cntl_2 |= SCLK_MUX_SEL(2); 4822 spll_func_cntl_2 |= SCLK_MUX_SEL(2);
4823 4823
4824 spll_func_cntl_3 &= ~SPLL_FB_DIV_MASK; 4824 spll_func_cntl_3 &= ~SPLL_FB_DIV_MASK;
4825 spll_func_cntl_3 |= SPLL_FB_DIV(fbdiv); 4825 spll_func_cntl_3 |= SPLL_FB_DIV(fbdiv);
4826 spll_func_cntl_3 |= SPLL_DITHEN; 4826 spll_func_cntl_3 |= SPLL_DITHEN;
4827 4827
4828 if (pi->sclk_ss) { 4828 if (pi->sclk_ss) {
4829 struct radeon_atom_ss ss; 4829 struct radeon_atom_ss ss;
@@ -4930,15 +4930,15 @@ static int si_populate_mclk_value(struct radeon_device *rdev,
4930 tmp = freq_nom / reference_clock; 4930 tmp = freq_nom / reference_clock;
4931 tmp = tmp * tmp; 4931 tmp = tmp * tmp;
4932 if (radeon_atombios_get_asic_ss_info(rdev, &ss, 4932 if (radeon_atombios_get_asic_ss_info(rdev, &ss,
4933 ASIC_INTERNAL_MEMORY_SS, freq_nom)) { 4933 ASIC_INTERNAL_MEMORY_SS, freq_nom)) {
4934 u32 clks = reference_clock * 5 / ss.rate; 4934 u32 clks = reference_clock * 5 / ss.rate;
4935 u32 clkv = (u32)((((131 * ss.percentage * ss.rate) / 100) * tmp) / freq_nom); 4935 u32 clkv = (u32)((((131 * ss.percentage * ss.rate) / 100) * tmp) / freq_nom);
4936 4936
4937 mpll_ss1 &= ~CLKV_MASK; 4937 mpll_ss1 &= ~CLKV_MASK;
4938 mpll_ss1 |= CLKV(clkv); 4938 mpll_ss1 |= CLKV(clkv);
4939 4939
4940 mpll_ss2 &= ~CLKS_MASK; 4940 mpll_ss2 &= ~CLKS_MASK;
4941 mpll_ss2 |= CLKS(clks); 4941 mpll_ss2 |= CLKS(clks);
4942 } 4942 }
4943 } 4943 }
4944 4944
@@ -5265,7 +5265,7 @@ static int si_convert_power_state_to_smc(struct radeon_device *rdev,
5265 ni_pi->enable_power_containment = false; 5265 ni_pi->enable_power_containment = false;
5266 5266
5267 ret = si_populate_sq_ramping_values(rdev, radeon_state, smc_state); 5267 ret = si_populate_sq_ramping_values(rdev, radeon_state, smc_state);
5268 if (ret) 5268 if (ret)
5269 ni_pi->enable_sq_ramping = false; 5269 ni_pi->enable_sq_ramping = false;
5270 5270
5271 return si_populate_smc_t(rdev, radeon_state, smc_state); 5271 return si_populate_smc_t(rdev, radeon_state, smc_state);
@@ -5436,46 +5436,46 @@ static bool si_check_s0_mc_reg_index(u16 in_reg, u16 *out_reg)
5436 case MC_SEQ_RAS_TIMING >> 2: 5436 case MC_SEQ_RAS_TIMING >> 2:
5437 *out_reg = MC_SEQ_RAS_TIMING_LP >> 2; 5437 *out_reg = MC_SEQ_RAS_TIMING_LP >> 2;
5438 break; 5438 break;
5439 case MC_SEQ_CAS_TIMING >> 2: 5439 case MC_SEQ_CAS_TIMING >> 2:
5440 *out_reg = MC_SEQ_CAS_TIMING_LP >> 2; 5440 *out_reg = MC_SEQ_CAS_TIMING_LP >> 2;
5441 break; 5441 break;
5442 case MC_SEQ_MISC_TIMING >> 2: 5442 case MC_SEQ_MISC_TIMING >> 2:
5443 *out_reg = MC_SEQ_MISC_TIMING_LP >> 2; 5443 *out_reg = MC_SEQ_MISC_TIMING_LP >> 2;
5444 break; 5444 break;
5445 case MC_SEQ_MISC_TIMING2 >> 2: 5445 case MC_SEQ_MISC_TIMING2 >> 2:
5446 *out_reg = MC_SEQ_MISC_TIMING2_LP >> 2; 5446 *out_reg = MC_SEQ_MISC_TIMING2_LP >> 2;
5447 break; 5447 break;
5448 case MC_SEQ_RD_CTL_D0 >> 2: 5448 case MC_SEQ_RD_CTL_D0 >> 2:
5449 *out_reg = MC_SEQ_RD_CTL_D0_LP >> 2; 5449 *out_reg = MC_SEQ_RD_CTL_D0_LP >> 2;
5450 break; 5450 break;
5451 case MC_SEQ_RD_CTL_D1 >> 2: 5451 case MC_SEQ_RD_CTL_D1 >> 2:
5452 *out_reg = MC_SEQ_RD_CTL_D1_LP >> 2; 5452 *out_reg = MC_SEQ_RD_CTL_D1_LP >> 2;
5453 break; 5453 break;
5454 case MC_SEQ_WR_CTL_D0 >> 2: 5454 case MC_SEQ_WR_CTL_D0 >> 2:
5455 *out_reg = MC_SEQ_WR_CTL_D0_LP >> 2; 5455 *out_reg = MC_SEQ_WR_CTL_D0_LP >> 2;
5456 break; 5456 break;
5457 case MC_SEQ_WR_CTL_D1 >> 2: 5457 case MC_SEQ_WR_CTL_D1 >> 2:
5458 *out_reg = MC_SEQ_WR_CTL_D1_LP >> 2; 5458 *out_reg = MC_SEQ_WR_CTL_D1_LP >> 2;
5459 break; 5459 break;
5460 case MC_PMG_CMD_EMRS >> 2: 5460 case MC_PMG_CMD_EMRS >> 2:
5461 *out_reg = MC_SEQ_PMG_CMD_EMRS_LP >> 2; 5461 *out_reg = MC_SEQ_PMG_CMD_EMRS_LP >> 2;
5462 break; 5462 break;
5463 case MC_PMG_CMD_MRS >> 2: 5463 case MC_PMG_CMD_MRS >> 2:
5464 *out_reg = MC_SEQ_PMG_CMD_MRS_LP >> 2; 5464 *out_reg = MC_SEQ_PMG_CMD_MRS_LP >> 2;
5465 break; 5465 break;
5466 case MC_PMG_CMD_MRS1 >> 2: 5466 case MC_PMG_CMD_MRS1 >> 2:
5467 *out_reg = MC_SEQ_PMG_CMD_MRS1_LP >> 2; 5467 *out_reg = MC_SEQ_PMG_CMD_MRS1_LP >> 2;
5468 break; 5468 break;
5469 case MC_SEQ_PMG_TIMING >> 2: 5469 case MC_SEQ_PMG_TIMING >> 2:
5470 *out_reg = MC_SEQ_PMG_TIMING_LP >> 2; 5470 *out_reg = MC_SEQ_PMG_TIMING_LP >> 2;
5471 break; 5471 break;
5472 case MC_PMG_CMD_MRS2 >> 2: 5472 case MC_PMG_CMD_MRS2 >> 2:
5473 *out_reg = MC_SEQ_PMG_CMD_MRS2_LP >> 2; 5473 *out_reg = MC_SEQ_PMG_CMD_MRS2_LP >> 2;
5474 break; 5474 break;
5475 case MC_SEQ_WR_CTL_2 >> 2: 5475 case MC_SEQ_WR_CTL_2 >> 2:
5476 *out_reg = MC_SEQ_WR_CTL_2_LP >> 2; 5476 *out_reg = MC_SEQ_WR_CTL_2_LP >> 2;
5477 break; 5477 break;
5478 default: 5478 default:
5479 result = false; 5479 result = false;
5480 break; 5480 break;
5481 } 5481 }
@@ -5562,19 +5562,19 @@ static int si_initialize_mc_reg_table(struct radeon_device *rdev)
5562 WREG32(MC_SEQ_PMG_CMD_MRS2_LP, RREG32(MC_PMG_CMD_MRS2)); 5562 WREG32(MC_SEQ_PMG_CMD_MRS2_LP, RREG32(MC_PMG_CMD_MRS2));
5563 WREG32(MC_SEQ_WR_CTL_2_LP, RREG32(MC_SEQ_WR_CTL_2)); 5563 WREG32(MC_SEQ_WR_CTL_2_LP, RREG32(MC_SEQ_WR_CTL_2));
5564 5564
5565 ret = radeon_atom_init_mc_reg_table(rdev, module_index, table); 5565 ret = radeon_atom_init_mc_reg_table(rdev, module_index, table);
5566 if (ret) 5566 if (ret)
5567 goto init_mc_done; 5567 goto init_mc_done;
5568 5568
5569 ret = si_copy_vbios_mc_reg_table(table, si_table); 5569 ret = si_copy_vbios_mc_reg_table(table, si_table);
5570 if (ret) 5570 if (ret)
5571 goto init_mc_done; 5571 goto init_mc_done;
5572 5572
5573 si_set_s0_mc_reg_index(si_table); 5573 si_set_s0_mc_reg_index(si_table);
5574 5574
5575 ret = si_set_mc_special_registers(rdev, si_table); 5575 ret = si_set_mc_special_registers(rdev, si_table);
5576 if (ret) 5576 if (ret)
5577 goto init_mc_done; 5577 goto init_mc_done;
5578 5578
5579 si_set_valid_flag(si_table); 5579 si_set_valid_flag(si_table);
5580 5580
@@ -5715,10 +5715,10 @@ static int si_upload_mc_reg_table(struct radeon_device *rdev,
5715 5715
5716static void si_enable_voltage_control(struct radeon_device *rdev, bool enable) 5716static void si_enable_voltage_control(struct radeon_device *rdev, bool enable)
5717{ 5717{
5718 if (enable) 5718 if (enable)
5719 WREG32_P(GENERAL_PWRMGT, VOLT_PWRMGT_EN, ~VOLT_PWRMGT_EN); 5719 WREG32_P(GENERAL_PWRMGT, VOLT_PWRMGT_EN, ~VOLT_PWRMGT_EN);
5720 else 5720 else
5721 WREG32_P(GENERAL_PWRMGT, 0, ~VOLT_PWRMGT_EN); 5721 WREG32_P(GENERAL_PWRMGT, 0, ~VOLT_PWRMGT_EN);
5722} 5722}
5723 5723
5724static enum radeon_pcie_gen si_get_maximum_link_speed(struct radeon_device *rdev, 5724static enum radeon_pcie_gen si_get_maximum_link_speed(struct radeon_device *rdev,
@@ -6820,7 +6820,7 @@ static int si_parse_power_table(struct radeon_device *rdev)
6820 struct _NonClockInfoArray *non_clock_info_array; 6820 struct _NonClockInfoArray *non_clock_info_array;
6821 union power_info *power_info; 6821 union power_info *power_info;
6822 int index = GetIndexIntoMasterTable(DATA, PowerPlayInfo); 6822 int index = GetIndexIntoMasterTable(DATA, PowerPlayInfo);
6823 u16 data_offset; 6823 u16 data_offset;
6824 u8 frev, crev; 6824 u8 frev, crev;
6825 u8 *power_state_offset; 6825 u8 *power_state_offset;
6826 struct ni_ps *ps; 6826 struct ni_ps *ps;