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

Commit b1aa5531 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nouveau: move pwm_divisor to the nouveau_pm_fan struct 



Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent bc6389e4

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ struct nouveau_pm_fan { 
	u32 min_duty;

	u32 max_duty;

	u32 pwm_freq;

	u32 pwm_divisor;

};



struct nouveau_pm_engine {
@@ -533,7 +534,6 @@ struct nouveau_pm_engine { 
	struct nouveau_pm_temp_sensor_constants sensor_constants;

	struct nouveau_pm_threshold_temp threshold_temp;

	struct nouveau_pm_fan fan;

	u32 pwm_divisor;



	struct nouveau_pm_level boot;

	struct nouveau_pm_level *cur;

drivers/gpu/drm/nouveau/nouveau_perf.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ nouveau_perf_init(struct drm_device *dev) 
			recordlen = perf[3] + (perf[4] * perf[5]);

			entries   = perf[2];



			pm->pwm_divisor = ROM16(perf[6]);

			pm->fan.pwm_divisor = ROM16(perf[6]);

		} else {

			recordlen = perf[2] + (perf[3] * perf[4]);

			entries   = perf[5];

drivers/gpu/drm/nouveau/nouveau_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent) 


	ret = nouveau_gpio_find(dev, 0, DCB_GPIO_PWM_FAN, 0xff, &gpio);

	if (ret == 0) {

		divs = pm->pwm_divisor;

		divs = pm->fan.pwm_divisor;

		if (pm->fan.pwm_freq) {

			/*XXX: PNVIO clock more than likely... */

			divs = 135000 / pm->fan.pwm_freq;