Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci don't muck with the LVDS_BLON bit



details:   https://anonhg.NetBSD.org/src/rev/c069af8023f6
branches:  trunk
changeset: 762073:c069af8023f6
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Feb 15 04:06:43 2011 +0000

description:
don't muck with the LVDS_BLON bit

diffstat:

 sys/dev/pci/r128fb.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r a9429554a8c4 -r c069af8023f6 sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c      Mon Feb 14 23:47:11 2011 +0000
+++ b/sys/dev/pci/r128fb.c      Tue Feb 15 04:06:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: r128fb.c,v 1.20 2011/01/22 15:14:28 cegger Exp $       */
+/*     $NetBSD: r128fb.c,v 1.21 2011/02/15 04:06:43 macallan Exp $     */
 
 /*
  * Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.20 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.21 2011/02/15 04:06:43 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -962,8 +962,7 @@
        level = 255 - level;
        reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL);
        reg &= ~R128_LEVEL_MASK;
-       reg |= (level << R128_LEVEL_SHIFT) | 
-              (level != 255 ? R128_LVDS_BLON : 0);
+       reg |= (level << R128_LEVEL_SHIFT);
        bus_space_write_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL, reg);
        DPRINTF("backlight level: %d reg %08x\n", level, reg);
 }
@@ -979,10 +978,6 @@
        sc->sc_bl_on = on;
        reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL);
        reg &= ~R128_LEVEL_MASK;
-       if (on) {
-               reg |= R128_LVDS_BLON;
-       } else
-               reg &= ~R128_LVDS_BLON;
        level = on ? 255 - sc->sc_bl_level : 255;
        reg |= level << R128_LEVEL_SHIFT;
        bus_space_write_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL, reg);



Home | Main Index | Thread Index | Old Index