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

Commit 4fddba1f authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: handle NI thermal controller 



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

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ enum radeon_int_thermal_type { 
	THERMAL_TYPE_RV770,

	THERMAL_TYPE_EVERGREEN,

	THERMAL_TYPE_SUMO,

	THERMAL_TYPE_NI,

};



struct radeon_voltage {

drivers/gpu/drm/radeon/radeon_atombios.c

+6 −0
Original line number Diff line number Diff line
@@ -1891,6 +1891,7 @@ static const char *pp_lib_thermal_controller_names[] = { 
	"Evergreen",

	"emc2103",

	"Sumo",

	"Northern Islands",

};



union power_info {
@@ -2154,6 +2155,11 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r 
				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_SUMO;

		} else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_NISLANDS) {

			DRM_INFO("Internal thermal controller %s fan control\n",

				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_NI;

		} else if ((controller->ucType ==

			    ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) ||

			   (controller->ucType ==

drivers/gpu/drm/radeon/radeon_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ static ssize_t radeon_hwmon_show_temp(struct device *dev, 
		temp = rv770_get_temp(rdev);

		break;

	case THERMAL_TYPE_EVERGREEN:

	case THERMAL_TYPE_NI:

		temp = evergreen_get_temp(rdev);

		break;

	case THERMAL_TYPE_SUMO: