[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69fb6b10fbb6
branches:  netbsd-7
changeset: 799789:69fb6b10fbb6
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Feb 11 23:06:01 2016 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c |  6 ++++--
 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c  |  8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r c9d4e034d23d -r 69fb6b10fbb6 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c      Thu Feb 11 23:02:54 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_base.c      Thu Feb 11 23:06:01 2016 +0000
@@ -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 @@
        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);
        }
 }
diff -r c9d4e034d23d -r 69fb6b10fbb6 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c       Thu Feb 11 23:02:54 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_fan.c       Thu Feb 11 23:06:01 2016 +0000
@@ -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 @@
        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 @@
                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);