Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Treat G4X like I915 and G33 for MSAC. Fixes aperture setting.

Browse Source 
Has been working successfully for me and snj for the last few months.
This commit is contained in:
markd 2009-05-04 11:05:45 +00:00
parent 6f0983460b
commit a44286a718
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/pci/agp_i810.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $ */ /* $NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $ */
/*- /*-
* Copyright (c) 2000 Doug Rabson * Copyright (c) 2000 Doug Rabson
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $"); __KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -706,6 +706,7 @@ agp_i810_get_aperture(struct agp_softc *sc)
break; break;
case CHIP_I915: case CHIP_I915:
case CHIP_G33: case CHIP_G33:
case CHIP_G4X:
reg = pci_conf_read(sc->as_pc, sc->as_tag, AGP_I915_MSAC); reg = pci_conf_read(sc->as_pc, sc->as_tag, AGP_I915_MSAC);
msac = (u_int16_t)(reg >> 16); msac = (u_int16_t)(reg >> 16);
if (msac & AGP_I915_MSAC_APER_128M) if (msac & AGP_I915_MSAC_APER_128M)
@ -716,16 +717,6 @@ agp_i810_get_aperture(struct agp_softc *sc)
case CHIP_I965: case CHIP_I965:
size = 512 * 1024 * 1024; size = 512 * 1024 * 1024;
break; break;
case CHIP_G4X:
reg = pci_conf_read(sc->as_pc, sc->as_tag, AGP_G4X_MSAC);
msac = (u_int16_t)(reg >> 16);
switch (msac & AGP_G4X_MSAC_MASK) {
case AGP_G4X_MSAC_APER_256M:
size = 256 * 1024 * 1024;
case AGP_G4X_MSAC_APER_512M:
size = 512 * 1024 * 1024;
}
break;
default: default:
aprint_error(": Unknown chipset\n"); aprint_error(": Unknown chipset\n");
} }