Module Name: src
Committed By: snj
Date: Thu Feb 11 23:06:01 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm [netbsd-7]:
nouveau_subdev_therm_base.c nouveau_subdev_therm_fan.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1084):
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c:
revision 1.2
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c:
revision 1.2
disable the once-a-second and many-times-a-minute logs about thermals.
these trigger on multiple cards for me and totally spam my logs in the
normal case. one card switches from 41% to 42% and back again quite
regularly.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c:1.1.1.1.4.1
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c:1.1.1.1 Wed Aug 6 12:36:32 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c Thu Feb 11 23:06:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_subdev_therm_base.c,v 1.1.1.1 2014/08/06 12:36:32 riastradh Exp $ */
+/* $NetBSD: nouveau_subdev_therm_base.c,v 1.1.1.1.4.1 2016/02/11 23:06:01 snj Exp $ */
/*
* Copyright 2012 The Nouveau community
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_therm_base.c,v 1.1.1.1 2014/08/06 12:36:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_therm_base.c,v 1.1.1.1.4.1 2016/02/11 23:06:01 snj Exp $");
#include <core/object.h>
#include <core/device.h>
@@ -141,7 +141,9 @@ nouveau_therm_update(struct nouveau_ther
spin_unlock_irqrestore(&priv->lock, flags);
if (duty >= 0) {
+#if 0 /* XXXMRG one log per second is a little excessive */
nv_debug(therm, "FAN target request: %d%%\n", duty);
+#endif
nouveau_therm_fan_set(therm, immd, duty);
}
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c:1.1.1.1.4.1
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c:1.1.1.1 Wed Aug 6 12:36:32 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c Thu Feb 11 23:06:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_subdev_therm_fan.c,v 1.1.1.1 2014/08/06 12:36:32 riastradh Exp $ */
+/* $NetBSD: nouveau_subdev_therm_fan.c,v 1.1.1.1.4.1 2016/02/11 23:06:01 snj Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_therm_fan.c,v 1.1.1.1 2014/08/06 12:36:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_therm_fan.c,v 1.1.1.1.4.1 2016/02/11 23:06:01 snj Exp $");
#include "priv.h"
@@ -53,7 +53,9 @@ nouveau_fan_update(struct nouveau_fan *f
target = max_t(u8, target, fan->bios.min_duty);
target = min_t(u8, target, fan->bios.max_duty);
if (fan->percent != target) {
+#if 0 /* XXXMRG one log per second is a little excessive */
nv_debug(therm, "FAN target: %d\n", target);
+#endif
fan->percent = target;
}
@@ -78,7 +80,9 @@ nouveau_fan_update(struct nouveau_fan *f
duty = target;
}
+#if 0 /* XXXMRG one log per second is a little excessive */
nv_debug(therm, "FAN update: %d\n", duty);
+#endif
ret = fan->set(therm, duty);
if (ret) {
spin_unlock_irqrestore(&fan->lock, flags);
