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

Commit 8a83ec5e authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: add voltage type to atom set voltage function 



This is needed for setting voltages other than vddc.

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

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void evergreen_pm_misc(struct radeon_device *rdev) 


	if ((voltage->type == VOLTAGE_SW) && voltage->voltage) {

		if (voltage->voltage != rdev->pm.current_vddc) {

			radeon_atom_set_voltage(rdev, voltage->voltage);

			radeon_atom_set_voltage(rdev, voltage->voltage, SET_VOLTAGE_TYPE_ASIC_VDDC);

			rdev->pm.current_vddc = voltage->voltage;

			DRM_DEBUG("Setting: v: %d\n", voltage->voltage);

		}

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ void r600_pm_misc(struct radeon_device *rdev) 


	if ((voltage->type == VOLTAGE_SW) && voltage->voltage) {

		if (voltage->voltage != rdev->pm.current_vddc) {

			radeon_atom_set_voltage(rdev, voltage->voltage);

			radeon_atom_set_voltage(rdev, voltage->voltage, SET_VOLTAGE_TYPE_ASIC_VDDC);

			rdev->pm.current_vddc = voltage->voltage;

			DRM_DEBUG_DRIVER("Setting: v: %d\n", voltage->voltage);

		}

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ void radeon_pm_suspend(struct radeon_device *rdev); 
void radeon_pm_resume(struct radeon_device *rdev);

void radeon_combios_get_power_modes(struct radeon_device *rdev);

void radeon_atombios_get_power_modes(struct radeon_device *rdev);

void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level);

void radeon_atom_set_voltage(struct radeon_device *rdev, u16 voltage_level, u8 voltage_type);

void rs690_pm_info(struct radeon_device *rdev);

extern int rv6xx_get_temp(struct radeon_device *rdev);

extern int rv770_get_temp(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_atombios.c

+5 −5
Original line number Diff line number Diff line
@@ -2577,25 +2577,25 @@ union set_voltage { 
	struct _SET_VOLTAGE_PARAMETERS_V2 v2;

};



void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level)

void radeon_atom_set_voltage(struct radeon_device *rdev, u16 voltage_level, u8 voltage_type)

{

	union set_voltage args;

	int index = GetIndexIntoMasterTable(COMMAND, SetVoltage);

	u8 frev, crev, volt_index = level;

	u8 frev, crev, volt_index = voltage_level;



	if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev))

		return;



	switch (crev) {

	case 1:

		args.v1.ucVoltageType = SET_VOLTAGE_TYPE_ASIC_VDDC;

		args.v1.ucVoltageType = voltage_type;

		args.v1.ucVoltageMode = SET_ASIC_VOLTAGE_MODE_ALL_SOURCE;

		args.v1.ucVoltageIndex = volt_index;

		break;

	case 2:

		args.v2.ucVoltageType = SET_VOLTAGE_TYPE_ASIC_VDDC;

		args.v2.ucVoltageType = voltage_type;

		args.v2.ucVoltageMode = SET_ASIC_VOLTAGE_MODE_SET_VOLTAGE;

		args.v2.usVoltageLevel = cpu_to_le16(level);

		args.v2.usVoltageLevel = cpu_to_le16(voltage_level);

		break;

	default:

		DRM_ERROR("Unknown table version %d, %d\n", frev, crev);

drivers/gpu/drm/radeon/radeon_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "drmP.h"

#include "radeon.h"

#include "avivod.h"

#include "atom.h"

#ifdef CONFIG_ACPI

#include <linux/acpi.h>

#endif
@@ -535,7 +536,8 @@ void radeon_pm_resume(struct radeon_device *rdev) 
	/* set up the default clocks if the MC ucode is loaded */

	if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {

		if (rdev->pm.default_vddc)

			radeon_atom_set_voltage(rdev, rdev->pm.default_vddc);

			radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,

						SET_VOLTAGE_TYPE_ASIC_VDDC);

		if (rdev->pm.default_sclk)

			radeon_set_engine_clock(rdev, rdev->pm.default_sclk);

		if (rdev->pm.default_mclk)
@@ -585,7 +587,8 @@ int radeon_pm_init(struct radeon_device *rdev) 
		/* set up the default clocks if the MC ucode is loaded */

		if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {

			if (rdev->pm.default_vddc)

				radeon_atom_set_voltage(rdev, rdev->pm.default_vddc);

				radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,

							SET_VOLTAGE_TYPE_ASIC_VDDC);

			if (rdev->pm.default_sclk)

				radeon_set_engine_clock(rdev, rdev->pm.default_sclk);

			if (rdev->pm.default_mclk)