[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/b265d58fcc3b
branches:  netbsd-7
changeset: 798348:b265d58fcc3b
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 18 10:25:33 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #94):
        sys/dev/pci/agp_i810.c: revision 1.113
        sys/dev/pci/agp_i810.c: revision 1.114
Revert to mapping the whole GTTMMADR region all at once for now and
use the right BAR for MMIO register sizing on i810.

diffstat:

 sys/dev/pci/agp_i810.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 3a43cb821f50 -r b265d58fcc3b sys/dev/pci/agp_i810.c
--- a/sys/dev/pci/agp_i810.c    Fri Sep 12 08:17:20 2014 +0000
+++ b/sys/dev/pci/agp_i810.c    Thu Sep 18 10:25:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $ */
+/*     $NetBSD: agp_i810.c,v 1.112.2.1 2014/09/18 10:25:33 martin Exp $        */
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.1 2014/09/18 10:25:33 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -405,7 +405,9 @@
                apbase = AGP_I965_GMADR;
                mmadr_bar = AGP_I965_MMADR;
                mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT;
-               isc->size = 512*1024;
+               if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
+                       AGP_I965_MMADR, mmadr_type, NULL, &isc->size, NULL))
+                       isc->size = 512*1024; /* XXX */
                gtt_bar = 0;
                gtt_off = AGP_I965_GTT;
                break;
@@ -413,14 +415,18 @@
                apbase = AGP_I965_GMADR;
                mmadr_bar = AGP_I965_MMADR;
                mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT;
-               isc->size = 512*1024;
+               if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
+                       AGP_I965_MMADR, mmadr_type, NULL, &isc->size, NULL))
+                       isc->size = 512*1024; /* XXX */
                gtt_bar = 0;
                gtt_off = AGP_G4X_GTT;
                break;
        default:
                apbase = AGP_I810_GMADR;
                mmadr_bar = AGP_I810_MMADR;
-               isc->size = 512*1024;
+               if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
+                       AGP_I810_MMADR, mmadr_type, NULL, &isc->size, NULL))
+                       isc->size = 512*1024; /* XXX */
                gtt_bar = 0;
                gtt_off = AGP_I810_GTT;
                break;