[src/trunk]: src/sys/dev/pci pull in rasops8 for radeonfb, while there deffla...

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

details:   https://anonhg.NetBSD.org/src/rev/b7ed78054c56
branches:  trunk
changeset: 758351:b7ed78054c56
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Nov 03 00:49:02 2010 +0000

description:
pull in rasops8 for radeonfb, while there defflag a bunch of options and
make them all use the same prefix

diffstat:

 sys/dev/pci/files.pci       |   7 +++++--
 sys/dev/pci/radeonfb.c      |   7 +++----
 sys/dev/pci/radeonfb_bios.c |  10 ++++++----
 sys/dev/pci/radeonfbvar.h   |   4 +---
 4 files changed, 15 insertions(+), 13 deletions(-)

diffs (113 lines):

diff -r 4715d6f9e320 -r b7ed78054c56 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Tue Nov 02 22:34:21 2010 +0000
+++ b/sys/dev/pci/files.pci     Wed Nov 03 00:49:02 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.329 2010/05/24 20:29:41 pgoyette Exp $
+#      $NetBSD: files.pci,v 1.330 2010/11/03 00:49:02 macallan Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -800,12 +800,15 @@
 
 # ATI Radeon framebuffer console driver
 # (Note: to enable the BIOS parser, add options RADEON_BIOS_INIT to the config)
-device radeonfb: wsemuldisplaydev, videomode, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm
+device radeonfb: wsemuldisplaydev, videomode, rasops8, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm
 attach radeonfb at pci
 file   dev/pci/radeonfb.c      radeonfb
 file   dev/pci/radeonfb_i2c.c  radeonfb
 file   dev/pci/radeonfb_bios.c radeonfb
 defflag opt_radeonfb.h RADEONFB_DEBUG
+defflag opt_radeonfb.h RADEONFB_BIOS_INIT
+defflag opt_radeonfb.h RADEONFB_BIOS_DEBUG
+defflag opt_radeonfb.h RADEONFB_MMAP_BARS
 
 # Chelsio Terminator 3 (T3) 10 gigabit ethernet
 device cxgbc { }
diff -r 4715d6f9e320 -r b7ed78054c56 sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c    Tue Nov 02 22:34:21 2010 +0000
+++ b/sys/dev/pci/radeonfb.c    Wed Nov 03 00:49:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $ */
+/*     $NetBSD: radeonfb.c,v 1.39 2010/11/03 00:49:02 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.39 2010/11/03 00:49:02 macallan Exp $");
 
 #define RADEONFB_DEFAULT_DEPTH 8
 
@@ -572,10 +572,9 @@
 
        radeonfb_loadbios(sc, pa);
 
-#ifdef RADEON_BIOS_INIT
+#ifdef RADEONFB_BIOS_INIT
        if (radeonfb_bios_init(sc)) {
                aprint_error("%s: BIOS inititialization failed\n", XNAME(sc));
-               goto error;
        }
 #endif
 
diff -r 4715d6f9e320 -r b7ed78054c56 sys/dev/pci/radeonfb_bios.c
--- a/sys/dev/pci/radeonfb_bios.c       Tue Nov 02 22:34:21 2010 +0000
+++ b/sys/dev/pci/radeonfb_bios.c       Wed Nov 03 00:49:02 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb_bios.c,v 1.3 2009/01/03 03:43:22 yamt Exp $ */
+/* $NetBSD: radeonfb_bios.c,v 1.4 2010/11/03 00:49:02 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb_bios.c,v 1.3 2009/01/03 03:43:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb_bios.c,v 1.4 2010/11/03 00:49:02 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,9 @@
 #include <dev/pci/radeonfbreg.h>
 #include <dev/pci/radeonfbvar.h>
 
-#ifdef RADEON_BIOS_INIT
+#include "opt_radeonfb.h"
+
+#ifdef RADEONFB_BIOS_INIT
 
 /*
  * Globals for the entire BIOS.
@@ -106,7 +108,7 @@
 #define        PLL_WAIT_CHK_SET_CLK_PWRMGT_CNTL24      5
 
 
-#ifdef RADEON_BIOS_DEBUG
+#ifdef RADEONFB_BIOS_DEBUG
 #define        DPRINTF(x)      printf x
 #else
 #define        DPRINTF(x)
diff -r 4715d6f9e320 -r b7ed78054c56 sys/dev/pci/radeonfbvar.h
--- a/sys/dev/pci/radeonfbvar.h Tue Nov 02 22:34:21 2010 +0000
+++ b/sys/dev/pci/radeonfbvar.h Wed Nov 03 00:49:02 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfbvar.h,v 1.9 2010/11/02 14:32:58 macallan Exp $ */
+/* $NetBSD: radeonfbvar.h,v 1.10 2010/11/03 00:49:02 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -363,9 +363,7 @@
 void radeonfb_putpll(struct radeonfb_softc *, uint32_t, uint32_t);
 void radeonfb_maskpll(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t);
 
-#ifdef RADEON_BIOS_INIT
 int    radeonfb_bios_init(struct radeonfb_softc *);
-#endif
 
 void   radeonfb_i2c_init(struct radeonfb_softc *);
 int    radeonfb_i2c_read_edid(struct radeonfb_softc *, int, uint8_t *);