Commit 58653abd authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: update radeon_atom_is_voltage_gpio() for SI 



SI uses a new atom table.  Required for DPM on SI.

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

drivers/gpu/drm/radeon/btc_dpm.c

+3 −3
Original line number Diff line number Diff line
@@ -2529,13 +2529,13 @@ int btc_dpm_init(struct radeon_device *rdev) 
	eg_pi->smu_uvd_hs = true;



	pi->voltage_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, 0);



	pi->mvdd_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC, 0);



	eg_pi->vddci_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI, 0);



	if (atom_parse_data_header(rdev->mode_info.atom_context, index, &size,

                                   &frev, &crev, &data_offset)) {

drivers/gpu/drm/radeon/cypress_dpm.c

+3 −3
Original line number Diff line number Diff line
@@ -2022,13 +2022,13 @@ int cypress_dpm_init(struct radeon_device *rdev) 
	pi->lmp = RV770_LMP_DFLT;



	pi->voltage_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, 0);



	pi->mvdd_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC, 0);



	eg_pi->vddci_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI, 0);



	if (atom_parse_data_header(rdev->mode_info.atom_context, index, &size,

                                   &frev, &crev, &data_offset)) {

drivers/gpu/drm/radeon/ni_dpm.c

+3 −3
Original line number Diff line number Diff line
@@ -3977,13 +3977,13 @@ int ni_dpm_init(struct radeon_device *rdev) 
	ni_pi->mclk_rtt_mode_threshold = eg_pi->mclk_edc_wr_enable_threshold;



	pi->voltage_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDC, 0);



	pi->mvdd_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_MVDDC, 0);



	eg_pi->vddci_control =

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI);

		radeon_atom_is_voltage_gpio(rdev, SET_VOLTAGE_TYPE_ASIC_VDDCI, 0);



	if (atom_parse_data_header(rdev->mode_info.atom_context, index, &size,

                                   &frev, &crev, &data_offset)) {

drivers/gpu/drm/radeon/radeon.h

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ int radeon_atom_get_max_voltage(struct radeon_device *rdev, 
int radeon_atom_get_voltage_table(struct radeon_device *rdev,

				  u8 voltage_type,

				  struct atom_voltage_table *voltage_table);

bool radeon_atom_is_voltage_gpio(struct radeon_device *rdev, u8 voltage_type);

bool radeon_atom_is_voltage_gpio(struct radeon_device *rdev,

				 u8 voltage_type, u8 voltage_mode);

void radeon_atom_update_memory_dll(struct radeon_device *rdev,

				   u32 mem_clock);

void radeon_atom_set_ac_timing(struct radeon_device *rdev,

drivers/gpu/drm/radeon/radeon_atombios.c

+50 −21
Original line number Diff line number Diff line
@@ -3104,10 +3104,12 @@ int radeon_atom_get_voltage_gpio_settings(struct radeon_device *rdev, 
union voltage_object_info {

	struct _ATOM_VOLTAGE_OBJECT_INFO v1;

	struct _ATOM_VOLTAGE_OBJECT_INFO_V2 v2;

	struct _ATOM_VOLTAGE_OBJECT_INFO_V3_1 v3;

};



bool

radeon_atom_is_voltage_gpio(struct radeon_device *rdev, u8 voltage_type)

radeon_atom_is_voltage_gpio(struct radeon_device *rdev,

			    u8 voltage_type, u8 voltage_mode)

{

	int index = GetIndexIntoMasterTable(DATA, VoltageObjectInfo);

	u8 frev, crev;
@@ -3120,6 +3122,9 @@ radeon_atom_is_voltage_gpio(struct radeon_device *rdev, u8 voltage_type) 
		voltage_info = (union voltage_object_info *)

			(rdev->mode_info.atom_context->bios + data_offset);



		switch (frev) {

		case 1:

		case 2:

			switch (crev) {

			case 1:

				num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
@@ -3147,6 +3152,30 @@ radeon_atom_is_voltage_gpio(struct radeon_device *rdev, u8 voltage_type) 
				DRM_ERROR("unknown voltage object table\n");

				return false;

			}

			break;

		case 3:

			switch (crev) {

			case 1:

				num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /

					sizeof(ATOM_VOLTAGE_OBJECT_INFO_V3_1);



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

					if ((voltage_info->v3.asVoltageObj[i].asGpioVoltageObj.sHeader.ucVoltageType ==

					     voltage_type) &&

					    (voltage_info->v3.asVoltageObj[i].asGpioVoltageObj.sHeader.ucVoltageMode ==

					     voltage_mode))

						return true;

				}

				break;

			default:

				DRM_ERROR("unknown voltage object table\n");

				return false;

			}

			break;

		default:

			DRM_ERROR("unknown voltage object table\n");

			return false;

		}



	}

	return false;