Attachment 946132 Details for Bug 1121331 – Patch applied to various kernel sources

[patch] Patch applied to various kernel sources

quietfan.patch (text/plain), 4.27 KB, created by Klaus-Peter Schrage on 2014-10-12 16:44:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus-Peter Schrage

Created: 2014-10-12 16:44:23 UTC

Size: 4.27 KB

patch

obsolete

>diff -uNrp kernel-3.15.fc20.orig/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h kernel-3.15.fc20.new/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h
>--- linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h	2014-08-03 14:39:19.363618114 +0200
>+++ linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h	2014-08-03 14:57:24.937607048 +0200
>@@ -31,12 +31,6 @@ struct nouveau_therm_trip_point {
> 	int hysteresis;
> };
> 
>-enum nvbios_therm_fan_mode {
>-	NVBIOS_THERM_FAN_TRIP = 0,
>-	NVBIOS_THERM_FAN_LINEAR = 1,
>-	NVBIOS_THERM_FAN_OTHER = 2,
>-};
>-
> struct nvbios_therm_fan {
> 	u16 pwm_freq;
> 
>@@ -46,7 +40,6 @@ struct nvbios_therm_fan {
> 	u16 bump_period;
> 	u16 slow_down_period;
> 
>-	enum nvbios_therm_fan_mode fan_mode;
> 	struct nouveau_therm_trip_point trip[NOUVEAU_TEMP_FAN_TRIP_MAX];
> 	u8 nr_fan_trip;
> 	u8 linear_min_temp;
>diff -uNrp kernel-3.15.fc20.orig/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c kernel-3.15.fc20.new/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c
>--- linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c	2014-08-03 14:39:19.370617907 +0200
>+++ linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c	2014-08-03 14:57:24.937607048 +0200
>@@ -164,7 +164,6 @@ nvbios_therm_fan_parse(struct nouveau_bi
> 
> 	i = 0;
> 	fan->nr_fan_trip = 0;
>-	fan->fan_mode = NVBIOS_THERM_FAN_OTHER;
> 	while ((entry = nvbios_therm_entry(bios, i++, &ver, &len))) {
> 		s16 value = nv_ro16(bios, entry + 1);
> 
>@@ -175,8 +174,6 @@ nvbios_therm_fan_parse(struct nouveau_bi
> 			break;
> 		case 0x24:
> 			fan->nr_fan_trip++;
>-			if (fan->fan_mode > NVBIOS_THERM_FAN_TRIP)
>-				fan->fan_mode = NVBIOS_THERM_FAN_TRIP;
> 			cur_trip = &fan->trip[fan->nr_fan_trip - 1];
> 			cur_trip->hysteresis = value & 0xf;
> 			cur_trip->temp = (value & 0xff0) >> 4;
>@@ -197,19 +194,11 @@ nvbios_therm_fan_parse(struct nouveau_bi
> 			fan->slow_down_period = value;
> 			break;
> 		case 0x46:
>-			if (fan->fan_mode > NVBIOS_THERM_FAN_LINEAR)
>-				fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
> 			fan->linear_min_temp = nv_ro08(bios, entry + 1);
> 			fan->linear_max_temp = nv_ro08(bios, entry + 2);
> 			break;
> 		}
> 	}
> 
>-	/* starting from fermi, fan management is always linear */
>-	if (nv_device(bios)->card_type >= NV_C0 &&
>-		fan->fan_mode == NVBIOS_THERM_FAN_OTHER) {
>-		fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
>-	}
>-
> 	return 0;
> }
>diff -uNrp kernel-3.15.fc20.orig/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/base.c kernel-3.15.fc20.new/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
>--- linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/base.c	2014-08-03 14:39:19.372617848 +0200
>+++ linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/base.c	2014-08-03 14:57:24.938607021 +0200
>@@ -110,18 +110,16 @@ nouveau_therm_update(struct nouveau_ther
> 		poll = false;
> 		break;
> 	case NOUVEAU_THERM_CTRL_AUTO:
>-		switch(priv->fan->bios.fan_mode) {
>-		case NVBIOS_THERM_FAN_TRIP:
>+		if (priv->fan->bios.nr_fan_trip) {
> 			duty = nouveau_therm_update_trip(therm);
>-			break;
>-		case NVBIOS_THERM_FAN_LINEAR:
>+		} else
>+		if (priv->fan->bios.linear_min_temp ||
>+		    priv->fan->bios.linear_max_temp) {
> 			duty = nouveau_therm_update_linear(therm);
>-			break;
>-		case NVBIOS_THERM_FAN_OTHER:
>+		} else {
> 			if (priv->cstate)
> 				duty = priv->cstate;
> 			poll = false;
>-			break;
> 		}
> 		immd = false;
> 		break;
>diff -uNrp kernel-3.15.fc20.orig/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c kernel-3.15.fc20.new/linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
>--- linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c	2014-08-03 14:39:19.372617848 +0200
>+++ linux-3.15.7-200.fc20.x86_64/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c	2014-08-03 14:57:24.938607021 +0200
>@@ -192,8 +192,11 @@ nouveau_therm_fan_set_defaults(struct no
> 	priv->fan->bios.max_duty = 100;
> 	priv->fan->bios.bump_period = 500;
> 	priv->fan->bios.slow_down_period = 2000;
>+/*XXX: talk to mupuf */
>+#if 0
> 	priv->fan->bios.linear_min_temp = 40;
> 	priv->fan->bios.linear_max_temp = 85;
>+#endif
> }
> 
> static void

Actions: View | Diff

Attachments on bug 1121331: 919267 | 919268 | 919269 | 919330 | 946132 | 971822