xserver-xorg-video-chips: Changes to 'upstream-unstable'
configure.ac | 19 +-
src/Makefile.am |3 +
src/compat-api.h | 99
src/ct_accel.c | 20 --
src/ct_bank.c| 61 +++-
src/ct_cursor.c |7 +--
src/ct_ddc.c |5 --
src/ct_dga.c | 32 -
src/ct_driver.c | 103 +--
src/ct_driver.h | 16 +---
src/ct_regs.c|3 -
src/ct_shadow.c |7 +--
src/ct_video.c |9 +---
13 files changed, 262 insertions(+), 122 deletions(-)
New commits:
commit bce7917e2ed8f6f4edcea0ff5c06b82eb1e85527
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-chips: bump to version 1.2.5
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index 2a8207a..14f6c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
-[1.2.4],
+[1.2.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
commit ffbe4a08d0326c6cd37af55233f27ddfa49c427e
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 15:24:04 2012 +1000
chips: fix make dist.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/Makefile.am b/src/Makefile.am
index b7daac0..473df17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,4 +53,4 @@ chips_drv_la_SOURCES = \
ct_regs.c \
ct_shadow.c \
ct_video.c \
- compat_api.h
+ compat-api.h
commit b3a693335779ac80d98734b0f4e5e229f878079f
Author: Dave Airlie airl...@redhat.com
Date: Mon Jul 16 04:39:40 2012 +0100
chips: build without XAA support at all.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index c0ed508..2a8207a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,23 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then
XORG_CFLAGS=$XORG_CFLAGS $PCIACCESS_CFLAGS
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])
save_CFLAGS=$CFLAGS
CFLAGS=$XORG_CFLAGS
diff --git a/src/ct_accel.c b/src/ct_accel.c
index e349baf..a829ee3 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -71,6 +71,8 @@
#define CTNAME(subname) CATNAME(CHIPS,subname)
#endif
+#ifdef HAVE_XAA_H
+
#ifdef DEBUG
# define DEBUG_P(x) ErrorF(x\n);
#elif defined X_DEBUG
@@ -166,10 +168,11 @@ static void CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x,
int y, int w, int h,
# define BE_SWAPON(pScrn,cPtr)
# define BE_SWAPOFF(pScrn,cPtr)
#endif
-
+#endif
Bool
CTNAME(AccelInit)(ScreenPtr pScreen)
{
+#ifdef HAVE_XAA_H
XAAInfoRecPtr infoPtr;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CHIPSPtr cPtr = CHIPSPTR(pScrn);
@@ -426,8 +429,12 @@ chips_imagewrite:
#endif
return(XAAInit(pScreen, infoPtr));
+#else
+return FALSE;
+#endif
}
+#ifdef HAVE_XAA_H
#ifdef CHIPS_HIQV
void
CTNAME(DepthChange)(ScrnInfoPtr pScrn, int depth)
@@ -459,15 +466,19 @@ CTNAME(DepthChange)(ScrnInfoPtr pScrn, int depth)
}
#endif
+#endif
void
CTNAME(Sync)(ScrnInfoPtr pScrn)
{
+#ifdef HAVE_XAA_H
CHIPSPtr cPtr = CHIPSPTR(pScrn);
DEBUG_P(sync);
ctBLTWAIT;
BE_SWAPON(pScrn,cPtr);
+#endif
}
+#ifdef HAVE_XAA_H
static void
CTNAME(8SetupForSolidFill)(ScrnInfoPtr pScrn, int color,
int rop, unsigned int planemask)
@@ -1735,3 +1746,5 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int
w, int h,
#endif /* ReadPixmap */
#endif
+
+#endif
diff --git a/src/ct_dga.c b/src/ct_dga.c
index b2f8ded..1e1d7b8 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -6,8 +6,6 @@
#include xf86.h
#include xf86_OSproc.h
#include xf86Pci.h
-#include xaa.h
-#include xaalocal.h
#include ct_driver.h
#include dgaproc.h
@@ -17,12 +15,14 @@ static Bool CHIPS_OpenFramebuffer(ScrnInfoPtr, char **,
unsigned char **,
static Bool CHIPS_SetMode(ScrnInfoPtr, DGAModePtr);
static int CHIPS_GetViewport(ScrnInfoPtr);
static void CHIPS_SetViewport(ScrnInfoPtr, int, int, int);
+#ifdef HAVE_XAA_H
static void CHIPS_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void CHIPS_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
#if 0
xserver-xorg-video-chips: Changes to 'upstream-unstable'
configure.ac|3
man/chips.man |3
src/ct_accel.c | 46 +-
src/ct_driver.c | 255 +++-
src/ct_driver.h |7 -
src/ct_video.c |3
util/dRegs.c| 57
util/iopl.h | 60 +
util/mRegs.c| 57
util/modClock.c | 53 ---
10 files changed, 109 insertions(+), 435 deletions(-)
New commits:
commit 989cf4f1fb2ac57f38d363734b71a5cf749db146
Author: Adam Jackson a...@redhat.com
Date: Mon Dec 19 17:45:41 2011 -0500
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 95092a2..08ccd72 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1444,6 +1444,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
return FALSE;
hwp = VGAHWPTR(pScrn);
+vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 12
cPtr-PIOBase = hwp-PIOOffset;
commit 5d5753551609f1483801e5edd8d42b11713c981e
Author: Adam Jackson a...@redhat.com
Date: Mon Dec 19 16:18:34 2011 -0500
Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/ct_driver.c b/src/ct_driver.c
index a2e5c94..95092a2 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1345,10 +1345,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
if (cPtr-Flags ChipsAccelSupport) {
if (!xf86LoadSubModule(pScrn, xaa)) {
- vbeFree(cPtr-pVbe);
- cPtr-pVbe = NULL;
- CHIPSFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn-scrnIndex, X_INFO, Falling back to shadowfb\n);
+ cPtr-Flags = ~(ChipsAccelSupport);
+ cPtr-Flags |= ChipsShadowFB;
}
}
commit 8a5ea07f30cc71ecc413fad0713facff72f77472
Author: Jeremy Huddleston jerem...@apple.com
Date: Tue Oct 18 23:21:33 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston jerem...@apple.com
diff --git a/src/ct_driver.c b/src/ct_driver.c
index e6538c6..a2e5c94 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
hwp = VGAHWPTR(pScrn);
vgaHWGetIOBase(hwp);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 12
cPtr-PIOBase = hwp-PIOOffset;
+#else
+cPtr-PIOBase = 0;
+#endif
+
/*
* Must allow ensure that storage for the 2nd set of vga registers is
* allocated for dual channel cards
diff --git a/src/ct_driver.h b/src/ct_driver.h
index 39eeb6e..9033867 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -276,8 +276,8 @@ typedef struct _CHIPSRec {
#endif
intChipset;
EntityInfoPtr pEnt;
-IOADDRESS PIOBase;
-CARD32 IOAddress;
+unsigned long PIOBase;
+unsigned long IOAddress;
unsigned long FbAddress;
unsigned int IOBase;
unsigned char *FbBase;
commit c421f2477c0d0dc712d6aece981fa6c961e5
Author: Jeremy Huddleston jerem...@apple.com
Date: Tue Oct 18 23:09:09 2011 -0700
Fix implicit declaration of iopl
warning: implicit declaration of function ‘iopl’
[-Wimplicit-function-declaration]
Signed-off-by: Jeremy Huddleston jerem...@apple.com
diff --git a/util/iopl.h b/util/iopl.h
index d7890b3..e08207c 100644
--- a/util/iopl.h
+++ b/util/iopl.h
@@ -3,6 +3,12 @@
# include machine/pio.h
# include machine/sysarch.h
#else
+# if defined(__linux__)
+/* Can't because sys/iopl.h provides conflicting inb, outb, etc
+ * #include sys/io.h
+ */
+int iopl(int level);
+# endif
# if defined(SVR4) defined(i386)
#include sys/types.h
#ifdef NCR
commit 94a8b34528b42a4fe6f81c8b8bd1ddb6bebaeea9
Author: Jeremy Huddleston jerem...@apple.com
Date: Tue Oct 18 23:04:32 2011 -0700
util: Consolidate common macros
Signed-off-by: Jeremy Huddleston jerem...@apple.com
diff --git a/util/dRegs.c b/util/dRegs.c
index b7edc8f..0d2f0cb 100644
--- a/util/dRegs.c
+++ b/util/dRegs.c
@@ -1,63 +1,8 @@
-
-
-
-
-
-
-#ifdef __NetBSD__
-# include sys/types.h
-# include machine/pio.h
-# include machine/sysarch.h
-#else
-# if defined(SVR4) defined(i386)
-#include sys/types.h
-#ifdef NCR
- /* broken NCR sys/sysi86.h */
-# define __STDC
-# include sys/sysi86.h
-# undef __STDC
-#else
-# include sys/sysi86.h
-#endif
-#ifdef SVR4
-# if !defined(sun)
-#include sys/seg.h
-# endif
-#endif
-#include sys/v86.h
-#if defined(sun)
-# include sys/psw.h
-#endif
-# endif
-# include AsmMacros.h
-#endif /* NetBSD */
-
#include unistd.h
xserver-xorg-video-chips: Changes to 'upstream-unstable'
.gitignore | 69 +++
COPYING | 157 +++
ChangeLog| 84
Makefile.am | 14
README | 286 +++---
README.sgml | 1084 ---
configure.ac | 53 +-
man/.gitignore |2
man/Makefile.am | 59 +-
man/chips.man|1
src/.gitignore |6
src/ct_BltHiQV.h |2
src/ct_accel.c |4
src/ct_ddc.c |4
src/ct_dga.c | 10
src/ct_driver.c | 87 +++-
src/ct_video.c | 31 -
util/.gitignore |5
18 files changed, 497 insertions(+), 1461 deletions(-)
New commits:
commit 314b72730340ce934c00f1756e4489e97635e1a9
Author: Julien Cristau jcris...@debian.org
Date: Sun Feb 27 17:12:48 2011 +0100
Bump to 1.2.4
diff --git a/configure.ac b/configure.ac
index 4155736..225e516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
-[1.2.3],
+[1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
commit 25c21f7c47b41283ae8b009068fe489bbdfa0b5a
Author: Julien Cristau jcris...@debian.org
Date: Sun Feb 27 16:41:08 2011 +0100
Replace deprecated xalloc/xrealloc/xfree with malloc/realloc/free
Signed-off-by: Julien Cristau jcris...@debian.org
diff --git a/src/ct_accel.c b/src/ct_accel.c
index 8d049eb..3920b0a 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -1181,7 +1181,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr
pPix)
} else funcNo = 2;
pad = (((pCache-w * bpp) + 31) 5) 2;
-dstPtr = data = (unsigned char*)xalloc(pad * pCache-h);
+dstPtr = data = malloc(pad * pCache-h);
srcPtr = (unsigned char*)pPix-devPrivate.ptr;
StippleFunc = StippleTab[funcNo];
@@ -1209,7 +1209,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr
pPix)
pScrn, pCache-x, pCache-y, pCache-w, pCache-h, data,
pad, bpp, pScrn-depth);
-xfree(data);
+free(data);
return pCache;
}
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index b8b2188..ab02d47 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -170,7 +170,7 @@ chips_i2cInit(ScrnInfoPtr pScrn)
I2CPtr-scrnIndex = pScrn-scrnIndex;
I2CPtr-I2CPutBits = chips_I2CPutBits;
I2CPtr-I2CGetBits = chips_I2CGetBits;
-I2CPtr-DriverPrivate.ptr = xalloc(sizeof(CHIPSI2CRec));
+I2CPtr-DriverPrivate.ptr = malloc(sizeof(CHIPSI2CRec));
((CHIPSI2CPtr)(I2CPtr-DriverPrivate.ptr))-cPtr = cPtr;
if (!xf86I2CBusInit(I2CPtr))
diff --git a/src/ct_dga.c b/src/ct_dga.c
index acda29f..32f3aa3 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -95,15 +95,15 @@ CHIPSDGAInit(ScreenPtr pScreen)
while(pMode) {
if(0 /*pScrn-displayWidth != pMode-HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/ct_driver.c b/src/ct_driver.c
index fb5803e..6624b79 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -771,7 +771,7 @@ CHIPSFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn-driverPrivate == NULL)
return;
-xfree(pScrn-driverPrivate);
+free(pScrn-driverPrivate);
pScrn-driverPrivate = NULL;
}
@@ -1487,7 +1487,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
/* Collect all of the relevant option flags (fill in pScrn-options) */
xf86CollectOptions(pScrn, NULL);
/* Process the options */
-if (!(cPtr-Options = xalloc(sizeof(ChipsHiQVOptions
+if (!(cPtr-Options = malloc(sizeof(ChipsHiQVOptions
return FALSE;
memcpy(cPtr-Options, ChipsHiQVOptions, sizeof(ChipsHiQVOptions));
xf86ProcessOptions(pScrn-scrnIndex, pScrn-options, cPtr-Options);
@@ -2566,7 +2566,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
-if (!(cPtr-Options = xalloc(sizeof(ChipsWingineOptions
+if (!(cPtr-Options = malloc(sizeof(ChipsWingineOptions
return FALSE;
memcpy(cPtr-Options, ChipsWingineOptions, sizeof(ChipsWingineOptions));
xf86ProcessOptions(pScrn-scrnIndex, pScrn-options, cPtr-Options);
@@ -3037,7 +3037,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
-if (!(cPtr-Options = xalloc(sizeof(Chips655xxOptions
+if (!(cPtr-Options = malloc(sizeof(Chips655xxOptions
return FALSE;
memcpy(cPtr-Options, Chips655xxOptions,
xserver-xorg-video-chips: Changes to 'upstream-unstable'
configure.ac|2 +-
src/ct_driver.c | 40 +++-
src/ct_shadow.c |1 -
src/ct_video.c |1 -
4 files changed, 36 insertions(+), 8 deletions(-)
New commits:
commit 49be03ad0812bcc14df8d80e767f8b88330e3fee
Author: Adam Jackson a...@redhat.com
Date: Wed Aug 19 13:43:47 2009 -0400
chips 1.2.2
diff --git a/configure.ac b/configure.ac
index b4120a3..3faac1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-chips],
-1.2.1,
+1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-chips)
commit 7a839c301d862a506b2368c98f2174a58b4d29a1
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 15:22:40 2009 +1000
chips: change to using ABI version check
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 828394f..eda2f63 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -85,7 +85,7 @@
/* Drivers that need to access the PCI config space directly need this */
#include xf86Pci.h
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
/* Standard resources are defined here */
#include xf86Resources.h
commit b6a8f36c406ec1c4a72f19bd8a6caf14058390aa
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 13:32:29 2009 +1000
chips: update for resources/RAC API removal
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 998c590..828394f 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -85,9 +85,14 @@
/* Drivers that need to access the PCI config space directly need this */
#include xf86Pci.h
+#ifndef XSERVER_LIBPCIACCESS
/* Standard resources are defined here */
#include xf86Resources.h
+/* Needed by Resources Access Control (RAC) */
+#include xf86RAC.h
+#endif
+
/* All drivers using the vgahw module need this */
#include vgaHW.h
@@ -115,9 +120,6 @@
#include xf4bpp.h
#endif
-/* Needed by Resources Access Control (RAC) */
-#include xf86RAC.h
-
/* int10 */
#include xf86int10.h
#include vbe.h
@@ -1104,7 +1106,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
/* This is the general case */
for (i = 0; ipScrn-numEntities; i++) {
cPtr-pEnt = xf86GetEntityInfo(pScrn-entityList[i]);
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr-pEnt-resources) return FALSE;
+#endif
/* If we are using libpciaccess this is already set in CHIPSPciProbe.
* If we are using something else we need to set it here.
*/
@@ -1371,11 +1375,14 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
}
}
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr-Flags ChipsLinearSupport)
xf86SetOperatingState(resVgaMem, cPtr-pEnt-index, ResDisableOpr);
if (cPtr-MMIOBaseVGA)
xf86SetOperatingState(resVgaIo, cPtr-pEnt-index, ResDisableOpr);
+#endif
+
vbeFree(cPtr-pVbe);
cPtr-pVbe = NULL;
return TRUE;
@@ -1400,7 +1407,9 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
CHIPSPanelSizePtr Size = cPtr-PanelSize;
CHIPSMemClockPtr MemClk = cPtr-MemClock;
CHIPSClockPtr SaveClk = (cPtr-SavedReg.Clock);
+#ifndef XSERVER_LIBPCIACCESS
resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
+#endif
/* Set pScrn-monitor */
pScrn-monitor = pScrn-confScreen-monitor;
@@ -1549,8 +1558,10 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
cPtr-FbAddress = PCI_REGION_BASE(cPtr-PciInfo, 0,
REGION_MEM) 0xff80;
from = X_PROBED;
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(cPtr-pEnt-index,NULL,ResNone))
cPtr-Flags = ~ChipsLinearSupport;
+#endif
} else {
if (cPtr-pEnt-device-MemBase) {
cPtr-FbAddress = cPtr-pEnt-device-MemBase;
@@ -1562,12 +1573,14 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
(0x80 (cPtr-readXR(cPtr, 0x05 16;
from = X_PROBED;
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].rBegin = cPtr-FbAddress;
linearRes[0].rEnd = cPtr-FbAddress + 0x80;
if (xf86RegisterResources(cPtr-pEnt-index,linearRes,ResNone)) {
cPtr-Flags = ~ChipsLinearSupport;
from = X_PROBED;
}
+#endif
}
}
if (cPtr-Flags ChipsLinearSupport) {
@@ -2455,7 +2468,9 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
CHIPSClockPtr SaveClk = (cPtr-SavedReg.Clock);
Bool useLinear = FALSE;
char *s;
+#ifndef XSERVER_LIBPCIACCESS
resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
+#endif
/* Set pScrn-monitor */
pScrn-monitor = pScrn-confScreen-monitor;
@@ -2651,12 +2666,14 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
cPtr-FbAddress |= ((mask (cPtr-readXR(cPtr, 0x08))) 16);
from = X_PROBED;
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].rBegin = cPtr-FbAddress;
linearRes[0].rEnd =
xserver-xorg-video-chips: Changes to 'upstream-unstable'
man/chips.man |2
src/ct_driver.c | 148 +++-
2 files changed, 21 insertions(+), 129 deletions(-)
New commits:
commit 722267e99012d0b8bbd7f22eaeac99e85bf48e0c
Author: Matthieu Herrb matthieu.he...@laas.fr
Date: Sun Jul 19 10:37:37 2009 +0200
Fix PCI card probe and chipset detection.
it appears that the chipstechnologies X driver was partially broken
during libpciaccess conversion. Thanks to the analysis by Marien Swart
in bug #18122 and a similar fix by Mark Kettenis for the radeon
driver.
Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 6ecc89e..998c590 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -480,14 +480,14 @@ static DisplayModeRec ChipsNTSCMode = {
{ PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
static const struct pci_id_match chips_device_match[] = {
- CHIPS_DEVICE_MATCH(PCI_CHIP_65545, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65548, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65550, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65554, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_6, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_68554, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_69000, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_69030, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65545, CHIPS_CT65545),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65548, CHIPS_CT65548),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65550, CHIPS_CT65550),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65554, CHIPS_CT65554),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_6, CHIPS_CT6),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_68554, CHIPS_CT68554),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69000, CHIPS_CT69000),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69030, CHIPS_CT69030),
{ 0, 0, 0 },
};
#endif
@@ -722,7 +722,7 @@ chipsSetup(pointer module, pointer opts, int *errmaj, int
*errmin)
if (!setupDone) {
setupDone = TRUE;
-xf86AddDriver(CHIPS, module, 0);
+xf86AddDriver(CHIPS, module, HaveDriverFuncs);
/*
* Modules that this driver always requires can be loaded here
@@ -801,7 +801,6 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct
pci_device * dev,
intptr_t match_data)
{
ScrnInfoPtr pScrn = NULL;
-EntityInfoPtr pEnt;
CHIPSPtr cPtr;
/* Allocate a ScrnInfoRec and claim the slot */
@@ -822,12 +821,16 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct
pci_device * dev,
pScrn-FreeScreen = CHIPSFreeScreen;
pScrn-ValidMode= CHIPSValidMode;
+ if (!CHIPSGetRec(pScrn)) {
+ return FALSE;
+ }
+ cPtr = CHIPSPTR(pScrn);
+ cPtr-Chipset = match_data;
/*
* For cards that can do dual head per entity, mark the entity
* as sharable.
*/
- pEnt = xf86GetEntityInfo(entity_num);
- if (pEnt-chipset == CHIPS_CT69030) {
+ if (match_data == CHIPS_CT69030) {
CHIPSEntPtr cPtrEnt = NULL;
DevUnion *pPriv;
@@ -1102,7 +1105,11 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
for (i = 0; ipScrn-numEntities; i++) {
cPtr-pEnt = xf86GetEntityInfo(pScrn-entityList[i]);
if (cPtr-pEnt-resources) return FALSE;
- cPtr-Chipset = cPtr-pEnt-chipset;
+ /* If we are using libpciaccess this is already set in CHIPSPciProbe.
+* If we are using something else we need to set it here.
+*/
+ if (!cPtr-Chipset)
+ cPtr-Chipset = cPtr-pEnt-chipset;
pScrn-chipset = (char *)xf86TokenToString(CHIPSChipsets,
cPtr-pEnt-chipset);
if ((cPtr-Chipset == CHIPS_CT64200) ||
commit 6c6b0933da2fb08e0804647f736b0155909d6348
Author: Adam Jackson a...@redhat.com
Date: Thu May 28 14:51:29 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 4bc5e68..6ecc89e 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -691,97 +691,6 @@ static const OptionInfoRec ChipsHiQVOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
-vgaHWAllocDefaultRegs,
-vgaHWFreeHWRec,
-vgaHWGetHWRec,
-vgaHWGetIOBase,
-vgaHWGetIndex,
-vgaHWHBlankKGA,
-vgaHWInit,
-vgaHWLock,
-vgaHWMapMem,
-vgaHWProtect,
-vgaHWRestore,
-vgaHWSave,
-vgaHWUnlock,
-vgaHWVBlankKGA,
-vgaHWddc1SetSpeedWeak,
-NULL
-};
-
-#ifdef XFree86LOADER
-static const char *miscfbSymbols[] = {
-#ifdef HAVE_XF1BPP
-
xserver-xorg-video-chips: Changes to 'upstream-unstable'
configure.ac| 10 +-
src/ct_driver.c | 18 --
src/ct_driver.h |7 ++-
src/ct_regs.c |3 ---
4 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 6380f6ac5924397c0be27198e9779971eb9b0086
Author: Dave Airlie airl...@redhat.com
Date: Mon Dec 22 14:27:11 2008 +1000
chips 1.2.1
diff --git a/configure.ac b/configure.ac
index 7dc6f0b..b4120a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-chips],
-1.2.0,
+1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-chips)
commit d791ee9897108fe301e39f7daba145130d78939d
Author: Adam Jackson a...@redhat.com
Date: Sun Nov 23 17:48:00 2008 -0500
Make ISA optional
diff --git a/configure.ac b/configure.ac
index 776f250..7dc6f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,14 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
+save_CFLAGS=$CFLAGS
+CFLAGS=$XORG_CFLAGS
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include xf86.h])
+CFLAGS=$save_CFLAGS
+
# Checks for header files.
AC_HEADER_STDC
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 1c791c8..4bc5e68 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1,4 +1,3 @@
-
/*
* Copyright 1993 by Jon Block bl...@frc.com
* Modified by Mike Hollick holl...@graphics.cis.upenn.edu
@@ -555,6 +554,7 @@ static PciChipsets CHIPSPCIchipsets[] = {
{ -1, -1, RES_UNDEFINED}
};
+#ifdef HAVE_ISA
static IsaChipsets CHIPSISAchipsets[] = {
{ CHIPS_CT65520, RES_EXCLUSIVE_VGA },
{ CHIPS_CT65525, RES_EXCLUSIVE_VGA },
@@ -574,6 +574,7 @@ static IsaChipsets CHIPSISAchipsets[] = {
{ CHIPS_CT64300, RES_EXCLUSIVE_VGA },
{ -1, RES_UNDEFINED }
};
+#endif
/* The options supported by the Chips and Technologies Driver */
typedef enum {
@@ -1040,7 +1041,8 @@ CHIPSProbe(DriverPtr drv, int flags)
xfree(usedChips);
}
}
-
+
+#ifdef HAVE_ISA
/* Isa Bus */
numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
drv,chipsFindIsaDevice,devSections,
@@ -1071,12 +1073,14 @@ CHIPSProbe(DriverPtr drv, int flags)
xfree(usedChips);
}
}
+#endif
xfree(devSections);
return foundScreen;
}
#endif
+#ifdef HAVE_ISA
static int
chipsFindIsaDevice(GDevPtr dev)
{
@@ -1160,6 +1164,7 @@ chipsFindIsaDevice(GDevPtr dev)
}
return found;
}
+#endif
/* Mandatory */
Bool
commit 328be647a21f0da7b7beacd56398d780726b
Author: Adam Jackson a...@redhat.com
Date: Fri Aug 15 14:04:11 2008 -0400
Uninclude xf86Version.h, remove some dead code.
diff --git a/src/ct_driver.c b/src/ct_driver.c
index f88bef2..1c791c8 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -86,9 +86,6 @@
/* Drivers that need to access the PCI config space directly need this */
#include xf86Pci.h
-/* This is used for module versioning */
-#include xf86Version.h
-
/* Standard resources are defined here */
#include xf86Resources.h
@@ -1542,11 +1539,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
hwp = VGAHWPTR(pScrn);
vgaHWGetIOBase(hwp);
-#if XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,1,0,0,0)
cPtr-PIOBase = hwp-PIOOffset;
-#else
- cPtr-PIOBase = 0 ; /* for old version the IO offset is global */
-#endif
/*
* Must allow ensure that storage for the 2nd set of vga registers is
* allocated for dual channel cards
diff --git a/src/ct_driver.h b/src/ct_driver.h
index d2fa6f7..d8ce228 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -275,11 +275,7 @@ typedef struct _CHIPSRec {
PCITAG PciTag;
intChipset;
EntityInfoPtr pEnt;
-#if XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,1,0,0,0)
- IOADDRESSPIOBase;
-#else
-intPIOBase; /* unused variable : here for
compatibility reason with newer version */
-#endif
+IOADDRESS PIOBase;
CARD32 IOAddress;
unsigned long FbAddress;
unsigned int IOBase;
diff --git a/src/ct_regs.c b/src/ct_regs.c
index e2f62df..e9a4c20 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -64,9 +64,6 @@
/* Drivers that need to access the PCI config space directly need this */
#include xf86Pci.h
-/* This is used for module versioning */
-#include xf86Version.h
-
/* Driver specific headers */
#include ct_driver.h
commit fe599dbf5178a10b0021c1f33bed528ce3199af9
Author: Julien Cristau jcris...@debian.org
Date: Mon Jun 2 21:32:17 2008 +0200
Compiler warning fixes
Include unistd.h for usleep(), and s/VERSION/CHIPS_/ in one place
where it had
xserver-xorg-video-chips: Changes to 'upstream-unstable'
.cvsignore | 20 - .gitignore | 21 + configure.ac | 16 +++- man/.cvsignore |2 man/.gitignore |2 man/Makefile.am|1 src/.cvsignore |6 - src/.gitignore |6 + src/Makefile.am|1 src/ct_BlitMM.h|2 src/ct_Blitter.h |2 src/ct_BltHiQV.h |2 src/ct_accel.c |5 - src/ct_bank.c |1 src/ct_cursor.c|1 src/ct_ddc.c |1 src/ct_dga.c |1 src/ct_driver.c| 207 ++--- src/ct_driver.h|3 src/ct_pcirename.h | 122 +++ src/ct_regs.c |1 src/ct_shadow.c|1 src/ct_video.c |1 util/.cvsignore|8 -- util/.gitignore|8 ++ util/AsmMacros.h |2 util/dRegs.c |2 util/mRegs.c |2 util/modClock.c|1 29 files changed, 377 insertions(+), 71 deletions(-) New commits: commit ce93cda53d399e3327577600e9bf2143f3128441 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 13:39:29 2008 -0400 chips 1.2.0 diff --git a/configure.ac b/configure.ac index 8c87eb0..776f250 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-chips], -1.1.1, +1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-chips) commit 01348b9ec5202d4d5e81a4615361e6040fd5c8e4 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 13:38:16 2008 -0400 Fix distcheck diff --git a/src/Makefile.am b/src/Makefile.am index a77c251..0ebf7ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,6 +49,7 @@ chips_drv_la_SOURCES = \ ct_dga.c \ ct_driver.c \ ct_driver.h \ +ct_pcirename.h \ ct_regs.c \ ct_shadow.c \ ct_video.c commit e5d3f0375d950387fb5b8e696675917861ab9158 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 13:35:01 2008 -0400 Death to RCS tags. diff --git a/src/ct_BlitMM.h b/src/ct_BlitMM.h index 7660241..eea7763 100644 --- a/src/ct_BlitMM.h +++ b/src/ct_BlitMM.h @@ -1,10 +1,8 @@ -/* $XConsortium: ct_BlitMM.h /main/2 1996/10/25 10:28:31 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.5 2002/11/25 14:04:58 eich Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* These are done using Memory Mapped IO, of the registers */ diff --git a/src/ct_Blitter.h b/src/ct_Blitter.h index ecb84f1..6791ca9 100644 --- a/src/ct_Blitter.h +++ b/src/ct_Blitter.h @@ -1,10 +1,8 @@ -/* $XConsortium: ct_Blitter.h /main/2 1996/10/25 10:28:37 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.4 2002/01/25 21:55:58 tsi Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* registers */ diff --git a/src/ct_BltHiQV.h b/src/ct_BltHiQV.h index 775aa54..8099d65 100644 --- a/src/ct_BltHiQV.h +++ b/src/ct_BltHiQV.h @@ -1,10 +1,8 @@ -/* $XConsortium: ct_BltHiQV.h /main/2 1996/10/25 10:28:43 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BltHiQV.h,v 1.10 2000/12/06 15:35:12 eich Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* These are done using Memory Mapped IO, of the registers */ diff --git a/src/ct_accel.c b/src/ct_accel.c index 1ccb480..8d049eb 100644 --- a/src/ct_accel.c +++ b/src/ct_accel.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c,v 1.40tsi Exp $ */ /* * Copyright 1996, 1997, 1998 by David Bateman [EMAIL PROTECTED] * Modified 1997, 1998 by Nozomi Ytow diff --git a/src/ct_bank.c b/src/ct_bank.c index 7f50e3e..d79e2f4 100644 --- a/src/ct_bank.c +++ b/src/ct_bank.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.6 2002/01/25 21:55:58 tsi Exp $ */ /* * Copyright 1997 diff --git a/src/ct_cursor.c b/src/ct_cursor.c index 34019e2..cc352d3 100644 --- a/src/ct_cursor.c +++ b/src/ct_cursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.24 2001/10/01 13:44:03 eich Exp $ */ /* * Copyright 1994 The XFree86 Project diff --git a/src/ct_ddc.c b/src/ct_ddc.c index 2202fd6..5e86c17 100644 --- a/src/ct_ddc.c +++ b/src/ct_ddc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.8 2001/05/09 19:57:04 dbateman Exp $ */ #ifdef HAVE_CONFIG_H #include config.h diff --git a/src/ct_dga.c b/src/ct_dga.c index e4d1c89..e3c1a00 100644 --- a/src/ct_dga.c +++ b/src/ct_dga.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.3tsi Exp $ */ #ifdef HAVE_CONFIG_H #include config.h diff --git a/src/ct_driver.c b/src/ct_driver.c index c05798f..725fcab 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -1,4
xserver-xorg-video-chips: Changes to 'upstream-unstable'
src/ct_video.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 242a378d6c0bead85b0b6e94f40c51849ba8f43b Author: Petteri Aimonen [EMAIL PROTECTED] Date: Fri Mar 16 21:39:54 2007 -0400 Fix Xv with scaling Fixes Bug 10225 diff --git a/src/ct_video.c b/src/ct_video.c index 19467d7..01b93ca 100644 --- a/src/ct_video.c +++ b/src/ct_video.c @@ -638,8 +638,8 @@ CHIPSDisplayVideo( if (dblscan) tmp = cPtr-VideoZoomMax 1; if (drw_h src_h) - tmp = tmp * src_h / drw_h; - cPtr-writeMR(cPtr, 0x33, tmp); + tmp = 256 * src_h / drw_h; + cPtr-writeMR(cPtr, 0x33, tmp 0xFC); } cPtr-writeMR(cPtr, 0x1F, m1f); cPtr-writeMR(cPtr, 0x1E, m1e); -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-chips: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 06b16bbfa010c66ee6ff76f11ce53b90678d7dec Author: Adam Jackson [EMAIL PROTECTED] Date: Sat Apr 8 01:21:18 2006 + Bump to 1.1.1 for Xv changes. commit c13ae9c043919c33f2770e58db01903a6a9826bf Author: Aaron Plattner [EMAIL PROTECTED] Date: Fri Apr 7 23:06:47 2006 + Add a DrawablePtr argument to the XV functions to pave the way for redirected video. commit c19d1b6306f3cd28ef069ac25c1fc5442b7a7eb6 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:56:44 2006 + VERSION - CHIPS_VERSION commit 9c768c7de5fa5e337cdfb91d099b79389dc7a473 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:41:11 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. commit eb58cfaf1a474fb171b2a628b6a92443a35022c5 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. commit 03e0cdd459ea05f71fabacfd7cb5f597fc2128bc Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:52 2005 + Stub COPYING files commit f8e6e3221db7de83f612533fccef07899bfdac36 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Dec 19 09:07:50 2005 + Typo fixes, mailing list url updates, and other changes to prepare for X11R6.9 7.0 releases. commit 78d667cd1f70317edd99fa2be9f872d16d7c261d Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:16 2005 + Update package version number for final X11R7 release candidate. commit c2c12ea61c2eab7b4e93a3eb249206592234fee8 Author: Adam Jackson [EMAIL PROTECTED] Date: Thu Dec 8 22:51:31 2005 + Re-fix for #4588, this one actually works. commit d6455cca874579ee0a6092e20d95f620306fc2f0 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:33 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit 47b3b2be8affaa16f0d71271d6a30ce5609f801f Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:32 2005 + Update package version number for X11R7 RC3 release. commit 40b686b18c29e3fee384521f3f495bd05ccdd784 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:07 2005 + Remove extraneous AC_MSG_RESULT. commit af6258df5710dc0bbe85d55cc50fe829435db8ad Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:58 2005 + Only build dlloader modules by default. commit d56c594474a5cf411f831b25ff6be3b4e7c546bb Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:04:08 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit 4d75a9d8c5bfb9d8a1b9faf475b6228bf57b0e38 Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:10 2005 + Add .cvsignores for drivers. commit 223319630ada3435fe3f2a85be812590ed9ad699 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:31:20 2005 + Bump version numbers for X11R6.9/X11R7 RC2. commit 65c7a923e3be45be2617e72c07d43f0d78fb0c17 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:14 2005 + Update package version number for X11R7 RC2 release. commit 6e95e7efbce398d71381067f03b180e4f0d69c30 Author: Kean Johnson [EMAIL PROTECTED] Date: Tue Nov 8 06:33:28 2005 + See ChangeLog entry 2005-11-07 for details. commit e7cf9f29514df4c94670e68df2aeaf85865a5ce1 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:52 2005 + Update pkgcheck depedencies to work with separate build roots. commit 19c8cb7e20cf4c1ca8416b9d0d9931007ad689c3 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:02 2005 + Update package version number for RC1 release. commit b3cb9f5a0cd3e73e879aa057302a939b2c33e1d9 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:01:53 2005 + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions to work better with BSD make commit 34e9d68c45bd308ae635d2339048bec86fc669a3 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Oct 17 22:57:32 2005 + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead of indirectly commit 4c4fead49dabaeccfa076858d200f09670cb7a9f Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:09:02 2005 + Use sed cpp to substitute variables in driver man pages commit 7acccac366100af7679430e540a530d638c12a9f Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Oct 6 23:08:00 2005 + Don't build utils if inb and friends aren't available commit ad3f384d6d95a50dcf99ef6c395499fcdf0ceec6 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Oct 5 01:07:23 2005 + Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman) commit b005b6550a7af480324d66e48e41f1507900eae4 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Tue
