xserver-xorg-video-glint: Changes to 'upstream-experimental'
DRI.txt | 407 --
Makefile.am |2
README |2
README.pm3 |2
configure.ac| 60 -
man/glint.man | 25
src/IBMramdac.c |4
src/Makefile.am | 11
src/TIramdac.c |4
src/compat-api.h| 99 ++
src/glint.h | 68 -
src/glint_common.h | 64 -
src/glint_dga.c | 31
src/glint_dri.c | 1960
src/glint_dri.h | 123 ---
src/glint_dripriv.h | 296 ---
src/glint_driver.c | 420 ---
src/glint_regs.h| 26
src/glint_shadow.c |3
src/pm2_accel.c | 12
src/pm2_dac.c | 12
src/pm2_video.c | 188 ++--
src/pm2ramdac.c |2
src/pm2v_dac.c |6
src/pm2vramdac.c|2
src/pm3_accel.c | 27
src/pm3_dac.c |8
src/pm3_regs.h |2
src/pm3_video.c | 10
src/pm_accel.c | 12
src/pm_dac.c|2
src/sx_accel.c | 13
src/tx_accel.c | 27
src/tx_dac.c|4
34 files changed, 530 insertions(+), 3404 deletions(-)
New commits:
commit be79ca10f6f3fd6d7f8aac2e5ae5d8b84480bd83
Author: Dave Airlie
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-glint: bump to version 1.2.8
Signed-off-by: Dave Airlie
diff --git a/configure.ac b/configure.ac
index 2d49e6b..97e58fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
-[1.2.7],
+[1.2.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint],
[xf86-video-glint])
AC_CONFIG_SRCDIR([Makefile.am])
commit e85b1f9595aa3cf7f2747b2aa1add1decd57ab2e
Author: Dave Airlie
Date: Mon Jul 16 04:20:02 2012 +0100
glint: build against server with no XAA support.
This removes the XAA bits so it builds against latest server.
Signed-off-by: Dave Airlie
diff --git a/configure.ac b/configure.ac
index 0f068b5..2d49e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,23 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA)
[default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+CFLAGS=$XORG_CFLAGS
+CPPFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
AC_SUBST([moduledir])
diff --git a/src/glint.h b/src/glint.h
index 2d4cf47..b58be67 100644
--- a/src/glint.h
+++ b/src/glint.h
@@ -35,7 +35,10 @@
#include "glintpcirename.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
+#include "xf86fbman.h"
#include "xf86RamDac.h"
#include "xf86cmap.h"
#include "xf86i2c.h"
@@ -142,7 +145,9 @@ typedef struct {
CARD32 PixelWidth;
RamDacRecPtr RamDacRec;
xf86CursorInfoPtr CursorInfoRec;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoRec;
+#endif
CloseScreenProcPtr CloseScreen;
ScreenBlockHandlerProcPtr BlockHandler;
GCPtr CurrentGC;
diff --git a/src/glint_dga.c b/src/glint_dga.c
index 6e62e8c..24bf6c9 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -29,9 +29,10 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
-#include "xaa.h"
-#include "xaalocal.h"
#include "glint.h"
+#ifdef HAVE_XAA_H
+#include "xaalocal.h"
+#endif
#include "glint_regs.h"
#include "dgaproc.h"
@@ -41,8 +42,10 @@ static Bool GLINT_SetMode(ScrnInfoPtr, DGAModePtr);
static void GLINT_Sync(ScrnInfoPtr);
static int GLINT_GetViewport(ScrnInfoPtr);
static void GLINT_SetViewport(ScrnInfoPtr, int, int, int);
+#ifdef HAVE_XAA_H
static void GLINT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void GLINT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+#endif
static
DGAFunctionRec GLINTDGAFuncs = {
@@ -52,8 +55,12 @@ DGAFunctionRec GLINTDGAFuncs = {
GLINT_SetViewport,
GLINT_GetViewport,
GLINT_Sync,
+#ifdef HAVE_XAA_H
GLINT_FillRect,
GLINT_BlitRect,
+#else
+ NULL, NULL,
+#endif
NULL
};
@@ -93,8 +100,10 @@ SECOND_PASS:
currentMode->mode = pMode;
currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+#ifdef HAVE_XAA_H
if(!pGlint->NoAccel)
currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+#endif
if(pMode->Flags & V_DBLSCAN)
currentMode->flags |= DGA_DOUBLESCAN;
if(pMode->Flags & V_INTERLACE)
@@ -206,6 +215,7 @@ GLINT_SetViewport(
pGlint->DGAViewportStatus
xserver-xorg-video-glint: Changes to 'upstream-experimental'
.gitignore | 70 ++- COPYING| 109 ++-- ChangeLog | 101 -- Makefile.am| 12 ++ README | 20 configure.ac | 54 ++-- man/.gitignore |2 man/Makefile.am| 59 - man/glint.man |2 src/.gitignore |6 - src/Makefile.am|2 src/glint.h|1 src/glint_dga.c|6 - src/glint_dri.c| 26 ++--- src/glint_driver.c | 233 +++-- src/glint_shadow.c |1 src/pm2_video.c| 22 ++--- src/pm3_accel.c|4 src/pm3_dac.c |4 src/pm3_video.c| 22 ++--- src/pm_accel.c |4 src/sx_accel.c |2 src/tx_accel.c |4 23 files changed, 323 insertions(+), 443 deletions(-) New commits: commit 7050a255115b2c5a70083d2d4ad775548ef701f7 Author: Matt Turner Date: Sat Sep 11 16:22:23 2010 -0400 xf86-video-glint 1.2.5 diff --git a/configure.ac b/configure.ac index 5f04bcb..450005b 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-glint], -[1.2.4], +[1.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-glint]) AC_CONFIG_SRCDIR([Makefile.am]) commit a2fa84df74b2c799b4bf992a212fa7c06dfa919f Author: Gaetan Nadon Date: Wed Jul 21 16:49:04 2010 -0400 config: add comments for main statements diff --git a/configure.ac b/configure.ac index cb96399..5f04bcb 100644 --- a/configure.ac +++ b/configure.ac @@ -20,18 +20,18 @@ # # Process this file with autoconf to produce a configure script +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-glint], [1.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-glint]) - AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# Checks for programs. +# Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL AH_TOP([#include "xorg-server.h"]) +# Define a configure option for an alternate module directory AC_ARG_WITH(xorg-module-dir, AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), @@ -57,14 +58,14 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], [DRI="$enableval"], [DRI=auto]) -# Checks for extensions +# Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) -# Checks for pkg-config packages +# Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), commit ebd5eec763716b34f9c5759c9214c068e85c1ed7 Author: Gaetan Nadon Date: Wed Jul 21 16:07:00 2010 -0400 config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Signed-off-by: Gaetan Nadon diff --git a/configure.ac b/configure.ac index f8cd3cc..cb96399 100644 --- a/configure.ac +++ b/configure.ac @@ -122,8 +122,9 @@ AC_SUBST([moduledir]) DRIVER_NAME=glint AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([ - Makefile - src/Makefile - man/Makefile +AC_CONFIG_FILES([ +Makefile +src/Makefile +man/Makefile ]) +AC_OUTPUT commit d4af4770f292539395ef9513fa3c7da6264ea90f Author: Gaetan Nadon Date: Wed Jul 21 14:37:41 2010 -0400 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING Signed-off-by: Gaetan Nadon diff --git a/configure.ac b/configure.ac index b162b67..f8cd3cc 100644 --- a/configure.ac +++ b/configure.ac @@ -47,12 +47,12 @@ AC_PROG_LIBTOOL AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, -AC_HELP_STRING([--with-xorg-module-dir=DIR], +AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], +AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], [Disable DRI support [[default=auto]]]), [DRI="$enableval"
xserver-xorg-video-glint: Changes to 'upstream-experimental'
configure.ac |3 -
src/glint_driver.c | 140 +--
src/glintpcirename.h |6 ++
src/pm3_dac.c| 12 ++--
4 files changed, 84 insertions(+), 77 deletions(-)
New commits:
commit f0b4f9629c4c11c33f8c6d382b21da99a0c52570
Author: Dave Airlie
Date: Mon Dec 22 14:33:28 2008 +1000
glint 1.2.2
diff --git a/configure.ac b/configure.ac
index d5b242b..b1b24a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
-1.2.1,
+1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
commit ea4b1f56fdcdd88f111e9ecbb73cd6583ad01ac8
Author: Adam Jackson
Date: Sun Nov 23 17:43:34 2008 -0500
Remove bizarre use of ISA setup
diff --git a/src/glint_driver.c b/src/glint_driver.c
index ad66e83..fd5b34c 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -692,17 +692,8 @@ GLINTProbe(DriverPtr drv, int flags)
if (pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"claimed PCI slot
%d:%d:%d\n",bus,device,func);
- } else {
- /* XXX This is a quick hack */
- int entity;
-
- entity = xf86ClaimIsaSlot(drv, 0,
- devSections[i], TRUE);
- pScrn = xf86ConfigIsaEntity(pScrn,0,entity,
- NULL,RES_SHARED_VGA,
- NULL,NULL,NULL,NULL);
}
- if (pScrn) {
+ if (pScrn) {
/* Fill in what we can of the ScrnInfoRec */
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"%s successfully probed\n", dev ? dev : "default
framebuffer device");
commit 9da29a371f7a12c5ebe225c94d0719d0cd6098e5
Author: Dave Airlie
Date: Mon Sep 15 02:33:25 2008 +1000
glint: fix build on alpha for pciaccess.
Redid patch from #17569 from jcris...@debian.org
diff --git a/src/glintpcirename.h b/src/glintpcirename.h
index c4beac6..9cd66c4 100644
--- a/src/glintpcirename.h
+++ b/src/glintpcirename.h
@@ -77,6 +77,9 @@ enum region_type {
#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+#define PCI_WRITE_BYTE(_pcidev, _value, _offset) \
+pciWriteByte(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
#else /* XSERVER_LIBPCIACCESS */
typedef struct pci_device *pciVideoPtr;
@@ -117,6 +120,9 @@ typedef struct pci_device *pciVideoPtr;
#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+#define PCI_WRITE_BYTE(_pcidev, _value, _offset) \
+pci_device_cfg_write_u8((_pcidev), (_value), (_offset))
+
#endif /* XSERVER_LIBPCIACCESS */
#endif /* SISPCIRENAME_H */
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index e11d190..9b1bd3b 100644
--- a/src/pm3_dac.c
+++ b/src/pm3_dac.c
@@ -437,9 +437,9 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
"VX1 secondary enabling VGA before int10\n");
/* Enable VGA on the current card. */
- pciWriteByte( pGlint->PciTag, 0xf8, 0 );
- pciWriteByte( pGlint->PciTag, 0xf4, 0 );
- pciWriteByte( pGlint->PciTag, 0xfc, 0 );
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0, 0xf8);
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0, 0xf4);
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0, 0xfc);
/* The card we are on should be VGA-enabled now, so run int10. */
if (xf86LoadSubModule(pScrn, "int10")) {
@@ -455,9 +455,9 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
"VX1 secondary disabling VGA after int10\n");
/* Finally, disable VGA on the current card. */
- pciWriteByte( pGlint->PciTag, 0xf8, 0x70 );
- pciWriteByte( pGlint->PciTag, 0xf4, 0x01 );
- pciWriteByte( pGlint->PciTag, 0xfc, 0x00 );
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0x70, 0xf8);
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0x01, 0xf4);
+ PCI_WRITE_BYTE(pGlint->PciInfo, 0x00, 0xfc);
}
}
#endif /* __alpha__ */
commit 986464aa29077a131304b407e4da565f85c144ab
Author: Adam Jackson
Date: Fri Aug 15 15:25:30 2008 -0400
Move DDC before mode validation so the EDID modes actually take effect.
diff --git a/src/glint_driver.c b/src/glint_driver.c
index b52cefd..ad66e83 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -2058,6 +2058,64 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Max pixel clock is %d MHz\n",
pGlint->MaxClock / 1000);
+/* Load DDC */
+if (!xf86LoadSubModule(pScrn, "ddc")) {
+ GLINTFreeRec(pScrn);
+ return FALSE;
+}
+xf86LoaderReqSymLists(ddcSymbols, NULL);
+/* Load I2C if
xserver-xorg-video-glint: Changes to 'upstream-experimental'
configure.ac |2 +-
src/glint_driver.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a68acd796e14742615eb071819b2910f69346a2b
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Jun 30 17:56:27 2008 +0200
Bump to 1.2.1
diff --git a/configure.ac b/configure.ac
index aa46117..238e5b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
-1.2.0,
+1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
commit 9c4f5ec0c8a5b48b9b923798175cc6e66932f8ed
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jun 24 03:17:32 2008 +0200
Fix regression from pciaccess conversion (bug#16060)
diff --git a/src/glint_driver.c b/src/glint_driver.c
index eb375ec..47127f9 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -1408,7 +1408,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
pGlint->IOAddress = pGlint->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0,
REGION_MEM) & 0xC000;
+ pGlint->IOAddress = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) &
0xC000;
}
if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-glint: Changes to 'upstream-experimental'
.cvsignore | 19 -
.gitignore | 20 ++
configure.ac | 15
man/.cvsignore |2
man/.gitignore |2
man/Makefile.am |1
src/.cvsignore |6 -
src/.gitignore |6 +
src/Makefile.am |1
src/glint.h | 17 +++--
src/glint_dri.c | 11 +--
src/glint_driver.c | 166 ---
src/glint_regs.h | 42 ++--
src/glintpcirename.h | 122 +
src/pm2_video.c | 16 +++-
src/pm3_dac.c| 24 ++-
src/tx_dac.c |6 -
17 files changed, 340 insertions(+), 136 deletions(-)
New commits:
commit 27da4e81ea2eceed69b37a5c6a19def9d1146258
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Mar 19 14:01:42 2008 -0400
glint 1.2.0
diff --git a/configure.ac b/configure.ac
index 2f9eeec..aa46117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
-1.1.1,
+1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
commit 71635ce6e595705c8841f68668d3efd7db9cec57
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Mar 19 13:58:54 2008 -0400
Fix distcheck
diff --git a/src/Makefile.am b/src/Makefile.am
index 8896038..79c9e54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ glint_drv_la_SOURCES = \
glint_dga.c \
glint_driver.c \
glint.h \
+glintpcirename.h \
glint_regs.h \
glint_shadow.c \
IBMramdac.c \
commit 7c0a6d5e978fbd3f635ba4a35dd24a9cb08ede92
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Tue Mar 11 15:47:34 2008 +1000
fix regression in tinderbox
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 8f2bb76..eb375ec 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -1539,7 +1539,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
*/
pGlint->IOAddress = base3copro;
#ifndef XSERVER_LIBPCIACCESS
- pGlint->memBase[0] = base3copro;
+ pGlint->PciInfo->memBase[0] = base3copro;
#endif
xf86DrvMsg(pScrn->scrnIndex, from,
"Delta Bug - Changing MMIO registers to 0x%lX\n",
commit bee9cba6766271c1e0e007eae8dcd853aa8ef361
Author: Dave Airlie <[EMAIL PROTECTED](none)>
Date: Tue Mar 11 10:15:00 2008 +1000
hey look a flying pig
it builds, but it may or may not work at all.
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 692ff5a..8f2bb76 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -49,7 +49,6 @@
#include "xf86int10.h"
#include "dixstruct.h"
#include "vbe.h"
-#include "cfb8_32.h"
#include "compiler.h"
#include "mipointer.h"
@@ -653,9 +652,11 @@ GLINTProbe(DriverPtr drv, int flags)
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
checkusedPci = xf86GetPciVideoInfo();
-if (checkusedPci == NULL && devSections /* for xf86DoProbe */) {
+if (checkusedPci == NULL && devSections /* for xf86DoProbe */)
+ {
/*
* Changed the behaviour to try probing using the FBDev support
* when no PCI cards have been found. This is for systems without
@@ -722,7 +723,9 @@ GLINTProbe(DriverPtr drv, int flags)
xfree(devSections);
-} else if (checkusedPci) {
+} else if (checkusedPci)
+#endif
+{
if (flags & PROBE_DETECT) {
/* HACK, Currently when -configuring, we only return VGA
* based chips. Manual configuring is necessary to poke
@@ -745,8 +748,8 @@ GLINTProbe(DriverPtr drv, int flags)
if (!(flags & PROBE_DETECT))
for (i = 0; i < numUsed; i++) {
ScrnInfoPtr pScrn = NULL;
- GLINTEntPtr pGlintEnt = NULL;
- DevUnion *pPriv;
+ GLINTEntPtr pGlintEnt = NULL;
+ DevUnion *pPriv;
pPci = xf86GetPciInfoForEntity(usedChips[i]);
/* Allocate a ScrnInfoRec and claim the slot */
@@ -756,14 +759,16 @@ GLINTProbe(DriverPtr drv, int flags)
/* Claim specifics, when we KNOW ! the board */
-
+#ifndef XSERVER_LIBPCIACCESS
/* Appian Jeronimo J2000 */
if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) &&
(PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) {
int eIndex;
+ int init_func;
+
if (!xf86IsEntityShared(usedChips[i])) {
eIndex = xf86ClaimPciSlot(pPci->bus,
- pPci->device,
+ pPci->device,
1,
