On Wed, Dec 04, 2002 at 02:48:50PM +0100, Michel D�nzer wrote:
> On Mit, 2002-12-04 at 12:52, Keith Whitwell wrote:
> > Jos� Fonseca wrote:
> > > Is there any reason no to enable x86 PCI support on Radeon?
> >
> > I think nobody's been able to make it work stably.
>
> I don't think PCI cards work less stably than AGP cards per se, the main
> concern is AGP cards falling back to PCI GART when agpgart isn't
> available for some reason. I wonder if there's a way to determine the
> slot type from the 2D driver?
If that's the reason then the solution couldn't be simpler. See the
patch attached.
Jos� Fonseca
Index: radeon_dri.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v
retrieving revision 1.21.20.1
diff -u -r1.21.20.1 radeon_dri.c
--- radeon_dri.c 27 Jun 2002 22:04:23 -0000 1.21.20.1
+++ radeon_dri.c 4 Dec 2002 14:25:54 -0000
@@ -1435,7 +1435,6 @@
drmFreeVersion(version);
}
-#if !defined(PCIGART_ENABLED)
/* Initialize AGP */
if (!info->IsPCI && !RADEONDRIAgpInit(info, pScreen)) {
RADEONDRICloseScreen(pScreen);
@@ -1443,22 +1442,13 @@
}
/* Initialize PCI */
+#if !defined(PCIGART_ENABLED)
if (info->IsPCI) {
xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] PCI cards not yet supported.
Disabling DRI.\n");
RADEONDRICloseScreen(pScreen);
return FALSE;
}
#else
- /* Initialize AGP */
- if (!info->IsPCI && !RADEONDRIAgpInit(info, pScreen)) {
- info->IsPCI = TRUE;
- xf86DrvMsg(pScreen->myNum, X_WARNING,
- "[agp] AGP failed to initialize -- falling back to PCI mode.\n");
- xf86DrvMsg(pScreen->myNum, X_WARNING,
- "[agp] Make sure you have the agpgart kernel module loaded.\n");
- }
-
- /* Initialize PCI */
if (info->IsPCI && !RADEONDRIPciInit(info, pScreen)) {
RADEONDRICloseScreen(pScreen);
return FALSE;
