Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84d88f4c authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/pm: voltage fixes 



- Enable GPIO voltage for non pm modes as well so resetting
the default voltage works.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 92645879

drivers/gpu/drm/radeon/radeon_atombios.c

+6 −3
Original line number Diff line number Diff line
@@ -1538,7 +1538,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) 
					rdev->pm.power_state[state_index].pcie_lanes =

						power_info->info.asPowerPlayInfo[i].ucNumPciELanes;

					misc = le32_to_cpu(power_info->info.asPowerPlayInfo[i].ulMiscInfo);

					if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {

					if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||

					    (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {

						rdev->pm.power_state[state_index].clock_info[0].voltage.type =

							VOLTAGE_GPIO;

						rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
@@ -1605,7 +1606,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) 
						power_info->info_2.asPowerPlayInfo[i].ucNumPciELanes;

					misc = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo);

					misc2 = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo2);

					if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {

					if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||

					    (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {

						rdev->pm.power_state[state_index].clock_info[0].voltage.type =

							VOLTAGE_GPIO;

						rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
@@ -1679,7 +1681,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) 
						power_info->info_3.asPowerPlayInfo[i].ucNumPciELanes;

					misc = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo);

					misc2 = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo2);

					if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {

					if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||

					    (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {

						rdev->pm.power_state[state_index].clock_info[0].voltage.type =

							VOLTAGE_GPIO;

						rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =

drivers/gpu/drm/radeon/radeon_combios.c

+6 −1
Original line number Diff line number Diff line
@@ -2454,6 +2454,11 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev) 
	rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk;

	rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk;

	rdev->pm.power_state[state_index].default_clock_mode = &rdev->pm.power_state[state_index].clock_info[0];

	if ((state_index > 0) &&

	    (rdev->pm.power_state[0].clock_info[0].voltage.type = VOLTAGE_GPIO))

		rdev->pm.power_state[state_index].clock_info[0].voltage =

			rdev->pm.power_state[0].clock_info[0].voltage;

	else

		rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;

	rdev->pm.power_state[state_index].pcie_lanes = 16;

	rdev->pm.power_state[state_index].flags = 0;