forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon/dpm: add dpm_enable failure output (si)

Browse source 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2013-03-28 10:45:50 -04:00
commit 2c48febb47
1 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

82
drivers/gpu/drm/radeon/si_dpm.c
View file

@ -5712,9 +5712,11 @@ int si_dpm_enable(struct radeon_device *rdev)
si_get_mvdd_configuration(rdev); si_get_mvdd_configuration(rdev);
if (pi->voltage_control) { if (pi->voltage_control) {
ret = si_construct_voltage_tables(rdev); ret = si_construct_voltage_tables(rdev);
if (ret) if (ret) {
DRM_ERROR("si_construct_voltage_tables failed\n");
return ret; return ret;
} }
}
if (eg_pi->dynamic_ac_timing) { if (eg_pi->dynamic_ac_timing) {
ret = si_initialize_mc_reg_table(rdev); ret = si_initialize_mc_reg_table(rdev);
if (ret) if (ret)
@ -5732,49 +5734,75 @@ int si_dpm_enable(struct radeon_device *rdev)
si_enable_display_gap(rdev); si_enable_display_gap(rdev);
si_program_vc(rdev); si_program_vc(rdev);
ret = si_upload_firmware(rdev); ret = si_upload_firmware(rdev);
if (ret) if (ret) {
return ret; DRM_ERROR("si_upload_firmware failed\n");
ret = si_process_firmware_header(rdev);
if (ret)
return ret;
ret = si_initial_switch_from_arb_f0_to_f1(rdev);
if (ret)
return ret;
ret = si_init_smc_table(rdev);
if (ret)
return ret;
ret = si_init_smc_spll_table(rdev);
if (ret)
return ret;
ret = si_init_arb_table_index(rdev);
if (ret)
return ret;
if (eg_pi->dynamic_ac_timing) {
ret = si_populate_mc_reg_table(rdev, boot_ps);
if (ret)
return ret; return ret;
} }
ret = si_process_firmware_header(rdev);
if (ret) {
DRM_ERROR("si_process_firmware_header failed\n");
return ret;
}
ret = si_initial_switch_from_arb_f0_to_f1(rdev);
if (ret) {
DRM_ERROR("si_initial_switch_from_arb_f0_to_f1 failed\n");
return ret;
}
ret = si_init_smc_table(rdev);
if (ret) {
DRM_ERROR("si_init_smc_table failed\n");
return ret;
}
ret = si_init_smc_spll_table(rdev);
if (ret) {
DRM_ERROR("si_init_smc_spll_table failed\n");
return ret;
}
ret = si_init_arb_table_index(rdev);
if (ret) {
DRM_ERROR("si_init_arb_table_index failed\n");
return ret;
}
if (eg_pi->dynamic_ac_timing) {
ret = si_populate_mc_reg_table(rdev, boot_ps);
if (ret) {
DRM_ERROR("si_populate_mc_reg_table failed\n");
return ret;
}
}
ret = si_initialize_smc_cac_tables(rdev); ret = si_initialize_smc_cac_tables(rdev);
if (ret) if (ret) {
DRM_ERROR("si_initialize_smc_cac_tables failed\n");
return ret; return ret;
}
ret = si_initialize_hardware_cac_manager(rdev); ret = si_initialize_hardware_cac_manager(rdev);
if (ret) if (ret) {
DRM_ERROR("si_initialize_hardware_cac_manager failed\n");
return ret; return ret;
}
ret = si_initialize_smc_dte_tables(rdev); ret = si_initialize_smc_dte_tables(rdev);
if (ret) if (ret) {
DRM_ERROR("si_initialize_smc_dte_tables failed\n");
return ret; return ret;
}
ret = si_populate_smc_tdp_limits(rdev, boot_ps); ret = si_populate_smc_tdp_limits(rdev, boot_ps);
if (ret) if (ret) {
DRM_ERROR("si_populate_smc_tdp_limits failed\n");
return ret; return ret;
}
ret = si_populate_smc_tdp_limits_2(rdev, boot_ps); ret = si_populate_smc_tdp_limits_2(rdev, boot_ps);
if (ret) if (ret) {
DRM_ERROR("si_populate_smc_tdp_limits_2 failed\n");
return ret; return ret;
}
si_program_response_times(rdev); si_program_response_times(rdev);
si_program_ds_registers(rdev); si_program_ds_registers(rdev);
si_dpm_start_smc(rdev); si_dpm_start_smc(rdev);
ret = si_notify_smc_display_change(rdev, false); ret = si_notify_smc_display_change(rdev, false);
if (ret) if (ret) {
DRM_ERROR("si_notify_smc_display_change failed\n");
return ret; return ret;
}
si_enable_sclk_control(rdev, true); si_enable_sclk_control(rdev, true);
si_start_dpm(rdev); si_start_dpm(rdev);