[src/trunk]: src/sys/arch/x86/x86 if we know the framebuffer's virtual addres...

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

details:   https://anonhg.NetBSD.org/src/rev/e9d5110913f0
branches:  trunk
changeset: 763004:e9d5110913f0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Mar 08 02:57:00 2011 +0000

description:
if we know the framebuffer's virtual address pass it to the fb driver

diffstat:

 sys/arch/x86/x86/x86_autoconf.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 809174532d13 -r e9d5110913f0 sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Mon Mar 07 23:21:13 2011 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Tue Mar 08 02:57:00 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.58 2011/02/22 06:33:33 dholland Exp $       */
+/*     $NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.58 2011/02/22 06:33:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -676,6 +676,9 @@
                if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY) {
 #if NWSDISPLAY > 0 && NGENFB > 0
                        extern struct vcons_screen x86_genfb_console_screen;
+                       struct rasops_info *ri;
+
+                       ri = &x86_genfb_console_screen.scr_ri;
 #endif
 
                        fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER);
@@ -695,8 +698,15 @@
                                prop_dictionary_set_uint16(dict, "linebytes",
                                    fbinfo->stride);
 
+                               prop_dictionary_set_uint64(dict, "address",
+                                   fbinfo->physaddr);
+#if NWSDISPLAY > 0 && NGENFB > 0
+                               if (ri->ri_bits != NULL) {
                                        prop_dictionary_set_uint64(dict,
-                                           "address", fbinfo->physaddr);
+                                           "virtual_address",
+                                           (vaddr_t)ri->ri_bits);
+                               }
+#endif
                                }
 #if notyet
                                prop_dictionary_set_bool(dict, "splash",