[src/trunk]: src/sys/arch/x86/pci hand genfb the virtual address of the actua...

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

details:   https://anonhg.NetBSD.org/src/rev/818038263ae2
branches:  trunk
changeset: 788964:818038263ae2
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jul 31 19:27:51 2013 +0000

description:
hand genfb the virtual address of the actual framebuffer, not the upper
left corner of the text area
now centering works and we don't scribble past the mapped VRAM when trying
to clear the screen in 32bit colour

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r b4440a8e084c -r 818038263ae2 sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Wed Jul 31 14:31:01 2013 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Wed Jul 31 19:27:51 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.59 2013/07/31 14:05:33 soren Exp $   */
+/*     $NetBSD: pci_machdep.c,v 1.60 2013/07/31 19:27:51 macallan Exp $        */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.59 2013/07/31 14:05:33 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.60 2013/07/31 19:27:51 macallan Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -897,7 +897,7 @@
                                if (ri->ri_bits != NULL) {
                                        prop_dictionary_set_uint64(dict,
                                            "virtual_address",
-                                           (vaddr_t)ri->ri_bits);
+                                           (vaddr_t)ri->ri_origbits);
                                }
 #endif
                                }
@@ -932,6 +932,7 @@
 #endif
                        }
                        prop_dictionary_set_bool(dict, "is_console", true);
+
                        prop_dictionary_set_bool(dict, "clear-screen", false);
 #if NWSDISPLAY > 0 && NGENFB > 0
                        prop_dictionary_set_uint16(dict, "cursor-row",