Commit fa4b5471 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dpm: add dpm_enable failure output (7xx-ni) 



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a9e61410

drivers/gpu/drm/radeon/btc_dpm.c

+18 −7
Original line number Diff line number Diff line
@@ -2353,15 +2353,19 @@ int btc_dpm_enable(struct radeon_device *rdev) 
	if (pi->voltage_control) {

		rv770_enable_voltage_control(rdev, true);

		ret = cypress_construct_voltage_tables(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_construct_voltage_tables failed\n");

			return ret;

		}

	}



	if (pi->mvdd_control) {

		ret = cypress_get_mvdd_configuration(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_get_mvdd_configuration failed\n");

			return ret;

		}

	}



	if (eg_pi->dynamic_ac_timing) {

		ret = btc_initialize_mc_reg_table(rdev);
@@ -2391,27 +2395,34 @@ int btc_dpm_enable(struct radeon_device *rdev) 
		btc_enable_dynamic_pcie_gen2(rdev, true);



	ret = rv770_upload_firmware(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("rv770_upload_firmware failed\n");

		return ret;



	}

	ret = cypress_get_table_locations(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_get_table_locations failed\n");

		return ret;

	}

	ret = btc_init_smc_table(rdev, boot_ps);

	if (ret)

		return ret;



	if (eg_pi->dynamic_ac_timing) {

		ret = cypress_populate_mc_reg_table(rdev, boot_ps);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_populate_mc_reg_table failed\n");

			return ret;

		}

	}



	cypress_program_response_times(rdev);

	r7xx_start_smc(rdev);

	ret = cypress_notify_smc_display_change(rdev, false);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_notify_smc_display_change failed\n");

		return ret;

	}

	cypress_enable_sclk_control(rdev, true);



	if (eg_pi->memory_transition)

drivers/gpu/drm/radeon/cypress_dpm.c

+21 −10
Original line number Diff line number Diff line
@@ -1813,15 +1813,19 @@ int cypress_dpm_enable(struct radeon_device *rdev) 
	if (pi->voltage_control) {

		rv770_enable_voltage_control(rdev, true);

		ret = cypress_construct_voltage_tables(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_construct_voltage_tables failed\n");

			return ret;

		}

	}



	if (pi->mvdd_control) {

		ret = cypress_get_mvdd_configuration(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_get_mvdd_configuration failed\n");

			return ret;

		}

	}



	if (eg_pi->dynamic_ac_timing) {

		cypress_set_mc_reg_address_table(rdev);
@@ -1854,31 +1858,38 @@ int cypress_dpm_enable(struct radeon_device *rdev) 
		cypress_enable_dynamic_pcie_gen2(rdev, true);



	ret = rv770_upload_firmware(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("rv770_upload_firmware failed\n");

		return ret;

	}



	ret = cypress_get_table_locations(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_get_table_locations failed\n");

		return ret;



	}

	ret = cypress_init_smc_table(rdev, boot_ps);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_init_smc_table failed\n");

		return ret;



	}

	if (eg_pi->dynamic_ac_timing) {

		ret = cypress_populate_mc_reg_table(rdev, boot_ps);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_populate_mc_reg_table failed\n");

			return ret;

		}

	}



	cypress_program_response_times(rdev);



	r7xx_start_smc(rdev);



	ret = cypress_notify_smc_display_change(rdev, false);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_notify_smc_display_change failed\n");

		return ret;



	}

	cypress_enable_sclk_control(rdev, true);



	if (eg_pi->memory_transition)

drivers/gpu/drm/radeon/ni_dpm.c

+36 −12
Original line number Diff line number Diff line
@@ -3530,9 +3530,11 @@ int ni_dpm_enable(struct radeon_device *rdev) 
	if (pi->voltage_control) {

		rv770_enable_voltage_control(rdev, true);

		ret = cypress_construct_voltage_tables(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("cypress_construct_voltage_tables failed\n");

			return ret;

		}

	}

	if (eg_pi->dynamic_ac_timing) {

		ret = ni_initialize_mc_reg_table(rdev);

		if (ret)
@@ -3552,42 +3554,64 @@ int ni_dpm_enable(struct radeon_device *rdev) 
	if (pi->dynamic_pcie_gen2)

		ni_enable_dynamic_pcie_gen2(rdev, true);

	ret = rv770_upload_firmware(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("rv770_upload_firmware failed\n");

		return ret;

	}

	ret = ni_process_firmware_header(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_process_firmware_header failed\n");

		return ret;

	}

	ret = ni_initial_switch_from_arb_f0_to_f1(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_initial_switch_from_arb_f0_to_f1 failed\n");

		return ret;

	}

	ret = ni_init_smc_table(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_init_smc_table failed\n");

		return ret;

	}

	ret = ni_init_smc_spll_table(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_init_smc_spll_table failed\n");

		return ret;

	}

	ret = ni_init_arb_table_index(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_init_arb_table_index failed\n");

		return ret;

	}

	if (eg_pi->dynamic_ac_timing) {

		ret = ni_populate_mc_reg_table(rdev, boot_ps);

		if (ret)

		if (ret) {

			DRM_ERROR("ni_populate_mc_reg_table failed\n");

			return ret;

		}

	}

	ret = ni_initialize_smc_cac_tables(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_initialize_smc_cac_tables failed\n");

		return ret;

	}

	ret = ni_initialize_hardware_cac_manager(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_initialize_hardware_cac_manager failed\n");

		return ret;

	}

	ret = ni_populate_smc_tdp_limits(rdev, boot_ps);

	if (ret)

	if (ret) {

		DRM_ERROR("ni_populate_smc_tdp_limits failed\n");

		return ret;

	}

	ni_program_response_times(rdev);

	r7xx_start_smc(rdev);

	ret = cypress_notify_smc_display_change(rdev, false);

	if (ret)

	if (ret) {

		DRM_ERROR("cypress_notify_smc_display_change failed\n");

		return ret;

	}

	cypress_enable_sclk_control(rdev, true);

	if (eg_pi->memory_transition)

		cypress_enable_mclk_control(rdev, true);

drivers/gpu/drm/radeon/rv770_dpm.c

+12 −5
Original line number Diff line number Diff line
@@ -1886,18 +1886,22 @@ int rv770_dpm_enable(struct radeon_device *rdev) 
	if (pi->voltage_control) {

		rv770_enable_voltage_control(rdev, true);

		ret = rv770_construct_vddc_table(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("rv770_construct_vddc_table failed\n");

			return ret;

		}

	}



	if (pi->dcodt)

		rv770_retrieve_odt_values(rdev);



	if (pi->mvdd_control) {

		ret = rv770_get_mvdd_configuration(rdev);

		if (ret)

		if (ret) {

			DRM_ERROR("rv770_get_mvdd_configuration failed\n");

			return ret;

		}

	}



	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_BACKBIAS)

		rv770_enable_backbias(rdev, true);
@@ -1921,12 +1925,15 @@ int rv770_dpm_enable(struct radeon_device *rdev) 
		rv770_enable_dynamic_pcie_gen2(rdev, true);



	ret = rv770_upload_firmware(rdev);

	if (ret)

	if (ret) {

		DRM_ERROR("rv770_upload_firmware failed\n");

		return ret;



	}

	ret = rv770_init_smc_table(rdev, boot_ps);

	if (ret)

	if (ret) {

		DRM_ERROR("rv770_init_smc_table failed\n");

		return ret;

	}



	rv770_program_response_times(rdev);

	r7xx_start_smc(rdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE