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 <jcristau@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 <jcristau@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 <jcristau@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, sizeof(Chips655xxOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -4063,7 +4063,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if(cPtr->Flags & ChipsShadowFB) {
cPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- cPtr->ShadowPtr = xalloc(cPtr->ShadowPitch * height);
+ cPtr->ShadowPtr = malloc(cPtr->ShadowPitch * height);
displayWidth = cPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = cPtr->ShadowPtr;
} else {
@@ -4625,10 +4625,8 @@ CHIPSCloseScreen(int scrnIndex, ScreenPtr pScreen)
XAADestroyInfoRec(cPtr->AccelInfoRec);
if (cPtr->CursorInfoRec)
xf86DestroyCursorInfoRec(cPtr->CursorInfoRec);
- if (cPtr->ShadowPtr)
- xfree(cPtr->ShadowPtr);
- if (cPtr->DGAModes)
- xfree(cPtr->DGAModes);
+ free(cPtr->ShadowPtr);
+ free(cPtr->DGAModes);
pScrn->vtSema = FALSE;
if(cPtr->BlockHandler)
pScreen->BlockHandler = cPtr->BlockHandler;
diff --git a/src/ct_video.c b/src/ct_video.c
index 130634b..a68acb9 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -70,7 +70,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -84,8 +84,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
if(num_adaptors)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -236,9 +235,9 @@ CHIPSSetupImageVideo(ScreenPtr pScreen)
XF86VideoAdaptorPtr adapt;
CHIPSPortPrivPtr pPriv;
- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(CHIPSPortPrivRec) +
- sizeof(DevUnion))))
+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+ sizeof(CHIPSPortPrivRec) +
+ sizeof(DevUnion))))
return NULL;
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
@@ -880,18 +879,18 @@ CHIPSAllocateSurface(
surface->width = w;
surface->height = h;
- if(!(surface->pitches = xalloc(sizeof(int)))) {
+ if(!(surface->pitches = malloc(sizeof(int)))) {
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(surface->offsets = xalloc(sizeof(int)))) {
- xfree(surface->pitches);
+ if(!(surface->offsets = malloc(sizeof(int)))) {
+ free(surface->pitches);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->pitches);
- xfree(surface->offsets);
+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->pitches);
+ free(surface->offsets);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
@@ -937,9 +936,9 @@ CHIPSFreeSurface(
if(pPriv->isOn)
CHIPSStopSurface(surface);
xf86FreeOffscreenLinear(pPriv->linear);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -1029,7 +1028,7 @@ CHIPSInitOffscreenImages(ScreenPtr pScreen)
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &Images[0];
commit a7b607ed727b44d78c3e88c0f74932a8f46f6470
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:53:31 2011 +0100
Fix compiler warning
src/ct_driver.c:160: warning: ‘chipsFindIsaDevice’ declared ‘static’ but never defined
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 61bdacf..fb5803e 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -157,7 +157,9 @@ static ModeStatus CHIPSValidMode(int scrnIndex, DisplayModePtr mode,
static Bool CHIPSSaveScreen(ScreenPtr pScreen, int mode);
/* Internally used functions */
+#ifdef HAVE_ISA
static int chipsFindIsaDevice(GDevPtr dev);
+#endif
static Bool chipsClockSelect(ScrnInfoPtr pScrn, int no);
Bool chipsModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void chipsSave(ScrnInfoPtr pScrn, vgaRegPtr VgaSave,
commit 3901322baf34a8e26fecc1915646d5e9c2252a9d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:51:24 2011 +0100
Fix unused variable warning
src/ct_driver.c: In function ‘CHIPSScreenInit’:
src/ct_driver.c:3920: warning: unused variable ‘racflag’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index f5aac65..61bdacf 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -3917,7 +3917,9 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
int init_picture = 0;
VisualPtr visual;
int allocatebase, freespace, currentaddr;
+#ifndef XSERVER_LIBPCIACCESS
unsigned int racflag = 0;
+#endif
unsigned char *FBStart;
int height, width, displayWidth;
CHIPSEntPtr cPtrEnt = NULL;
commit c409e213143156893a157d73c37a14df6bf0041b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:50:21 2011 +0100
Fix compiler warning on 64bit
src/ct_driver.c: In function ‘chipsPreInitHiQV’:
src/ct_driver.c:1598: warning: format ‘%lX’ expects type ‘long unsigned int’, but argument 4 has type ‘CARD32’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 0631a4f..f5aac65 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1595,7 +1595,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
#endif
cPtr->IOAddress = cPtr->FbAddress + 0x400000L;
xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,
- "IOAddress is set at 0x%lX.\n",cPtr->IOAddress);
+ "IOAddress is set at 0x%lX.\n",(unsigned long)cPtr->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from,
commit c4d03c11f889e12100f5770c13b5e50463043a4b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:43:45 2011 +0100
Add parentheses to fix compiler warnings
src/ct_ddc.c: In function ‘chips_ddc1Read’:
src/ct_ddc.c:34: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
src/ct_dga.c: In function ‘CHIPS_SetViewport’:
src/ct_dga.c:243: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
src/ct_driver.c: In function ‘chipsTestDACComp’:
src/ct_driver.c:7490: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index 5e86c17..b8b2188 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -31,7 +31,7 @@ chips_ddc1Read(ScrnInfoPtr pScrn)
register unsigned int tmp;
while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
tmp = cPtr->readXR(cPtr, 0x63);
return (tmp & ddc_mask);
}
diff --git a/src/ct_dga.c b/src/ct_dga.c
index e3c1a00..acda29f 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -239,8 +239,8 @@ CHIPS_SetViewport(
CHIPSPtr cPtr = CHIPSPTR(pScrn);
if (flags & DGA_FLIP_RETRACE) {
- while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while ((hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
}
CHIPSAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 97031ef..0631a4f 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -7487,7 +7487,7 @@ chipsTestDACComp(ScrnInfoPtr pScrn, unsigned char a, unsigned char b,
hwp->writeDacWriteAddr(hwp, 0x00);
while ((hwp->readST01(hwp)) & 0x08){}; /* wait for vsync to end */
- while (!(hwp->readST01(hwp)) & 0x08){}; /* wait for new vsync */
+ while (!((hwp->readST01(hwp)) & 0x08)){}; /* wait for new vsync */
hwp->writeDacData(hwp, a); /* set pattern */
hwp->writeDacData(hwp, b);
hwp->writeDacData(hwp, c);
commit 5830fed3ebce5e5bacab85e37176cb81859828ef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 22 16:37:29 2010 -0500
Import the xf8_16bpp implementation
This is trivial, just do it directly.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 28a1660..97031ef 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -111,8 +111,7 @@
#include "micmap.h"
#include "fb.h"
-#include "cfb8_16.h"
-
+#include "fboverlay.h"
/* Needed for the 1 and 4 bpp framebuffers */
#ifdef HAVE_XF1BPP
@@ -1332,16 +1331,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
}
break;
#endif
- case 16:
- if (cPtr->Flags & ChipsOverlay8plus16) {
- if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
- vbeFree(cPtr->pVbe);
- cPtr->pVbe = NULL;
- CHIPSFreeRec(pScrn);
- return FALSE;
- }
- break;
- }
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
vbeFree(cPtr->pVbe);
@@ -3904,6 +3893,18 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
hwp->disablePalette(hwp);
}
+static Bool
+cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+ int xsize, int ysize, int dpix, int dpiy,
+ int width16, int width8)
+{
+ return
+ (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8) &&
+ fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8, 16, 8));
+}
+
/* Mandatory */
static Bool
CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
commit 02b3264149703eac325026a87dfa89d68d6ae1c8
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:50 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/chips.man b/man/chips.man
index 3f8cfe1..740af38 100644
--- a/man/chips.man
+++ b/man/chips.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.4 2001/12/17 20:52:32 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CHIPS __drivermansuffix__ __vendorversion__
commit 8e957e501db31059e49e81e56cdc31e3440d771b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jul 23 19:38:21 2010 -0400
config: add AM_PROG_CC_C_O for per-target compilation flags
The use of per-target compilation flags with C sources requires
that the macro AM_PROG_CC_C_O be called from configure.ac
If the C compiler does not accept the -c and -o options simultaneously,
define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
found by AC_PROG_CC, and, if different, the first cc in the path.
The test fails if one fails. This macro was created for GNU Make
to choose the default C compilation rule.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index bfc0059..4155736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,9 @@ XORG_DEFAULT_OPTIONS
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Checks for programs.
+AM_PROG_CC_C_O
+
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
commit 5665714d0de33571d97def69d00d7bfa9e0d5b8a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 23 11:33:37 2010 -0700
xf86-video-chips 1.2.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e4fdd5a..bfc0059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
- [1.2.2],
+ [1.2.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
commit a9c2df54a42e168d12c4e342ae9d9cffb23d4313
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 01e181a..e4fdd5a 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-chips],
[1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
-
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,25 +40,26 @@ 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]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# 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)
-# 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])
# Checks for libraries.
commit 0e225c6674b61928bd442959ef1c5f67b8ea6271
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c20a6b9..01e181a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,9 +104,10 @@ AC_SUBST([moduledir])
DRIVER_NAME=chips
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
- util/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
+ util/Makefile
])
+AC_OUTPUT
commit 02d4b3da8ddb8cb94c3ddba2a436b6b2c6e90a5a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index afeb544..c20a6b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ 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"])
commit 7c22a9399d6ee6a75b178b7727eeca6139038268
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4a89c1e..afeb544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-chips],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 95f26913d129835596ccf1a1c1b353408fb8c52c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8902ce7..4a89c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
- 1.2.2,
+ [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-chips)
+ [xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 19343524c3c85bd3d5313aca52148950445d56f7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index a4f1f0a..8902ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ int main() {
AC_MSG_RESULT([$HAVE_INB])
AM_CONDITIONAL(BUILD_UTILS, [test x$HAVE_INB = xyes])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=chips
commit 1fcb540b7c08fd1b3b094b3d661d1b6800d4993c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index bd23616..a4f1f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,8 +85,6 @@ AC_CHECK_DECL(xf86ConfigIsaEntity,
[#include "xf86.h"])
CFLAGS="$save_CFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
# Checks for functions (often defined as inlines in compiler.h)
AC_MSG_CHECKING([for inb])
commit daf89fba39a18608c8560f635cd91218c7bfcd52
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:30 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index bef208f..bd23616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 69d9535d6601d0df8de6eae1afb28ea6d8d88dfb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:18 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 2ac2b64..bef208f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 6d37a83a60fefcb5922c904331d4f8ec1fac0e44
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 62820a7..2ac2b64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit d8ce758f945cd5ec59be14d8d37311413784be59
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 16:52:28 2010 -0400
README: discard the sgml version
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index c189e72..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,1081 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-
-<!-- Title information -->
-<title> Information for Chips and Technologies Users
-<author> David Bateman (<url url="mailto:dbateman@club-internet.fr";>),
- Egbert Eich (<url url="mailto:eich@freedesktop.org";>)
-<date> 1st January 2001
-
-<!-- Table of contents -->
-<toc>
-
-<sect> Introduction <p>
-
-The Chips and Technologies driver release in X11R&relvers; came from XFree86
-4.4 rc2; this document was originally included in that release and has been
-updated modestly to reflect differences between X11R&relvers; and XFree86
-4.4 rc2.
-
-With the release of XFree86 version 4.0, the Chips and Technologies
-driver has been extensively rewritten and contains many new features.
-This driver must be considered work in progress, and those users
-wanting stability are encouraged to use the older XFree86 3.3.x
-versions. However this version of the Chips and Technologies driver
-has many new features and bug fixes that might make users prefer
-to use this version. These features include
-
-<itemize>
-<item>The long standing black/blue screen problem that some people have
- had should be fixed.
-<item>Hardware/Software cursor switching on the fly, that should fix
- many of the known hardware cursor problems.
-<item>Gamma correction at all depths and DirectColor visuals for depths of
- 15 or greater with the HiQV series of chipsets.
-<item>Supports PseudoColor overlays on 16bpp TrueColor screens for HiQV.
-<item>Supports YUV colour space conversion with the XVideo extension.
-<item>32bpp pixmaps while using a framebuffer in 24bpp packed pixel mode.
-<item>Heaps more acceleration.
-<item>1/4bpp support.
-<item>Multihead
-<item>Much more...
-</itemize>
-
-This document attempts to discuss the features of this driver, the
-options useful in configuring it and the known problems. Most of the
-Chips and Technologies chipsets are supported by this driver to some
-degree.
-
-<sect> Supported Chips <p>
-
-The Chips and Technologies chipsets supported by this driver have one
-of three basic architectures. A basic architecture, the WinGine architecture
-which is a modification on this basic architecture and a completely new
-HiQV architecture.
-
-<sect1>Basic architecture<p>
-<descrip>
-<tag>ct65520</tag>
- (Max Ram: 1Mb, Max Dclk: 68MHz@5V)
-<tag>ct65525</tag>
- This chip is basically identical to the 65530. It has the same
- ID and is identified as a 65530 when probed. See ct65530 for
- details.
-<tag>ct65530</tag>
- This is a very similar chip to the 65520. However it additionally
- has the ability for mixed 5V and 3.3V operation and linear addressing
- of the video memory.
- (Max Ram: 1Mb, Max Dclk: 56MHz@3.3V, 68MHz@5V)
-<tag>ct65535</tag>
- This is the first chip of the ct655xx series to support fully
- programmable clocks. Otherwise it has the the same properties
- as the 65530.
-<tag>ct65540</tag>
- This is the first version of the of the ct655xx that was capable
- of supporting Hi-Color and True-Color. It also includes a fully
- programmable dot clock and supports all types of flat panels.
- (Max Ram: 1Mb, Max Dclk: 56MHz@3.3V, 68MHz@5V)
-<tag>ct65545</tag>
- The chip is very similar to the 65540, with the addition of H/W
- cursor, pop-menu acceleration, BitBLT and support of PCI Buses.
- PCI version also allow all the BitBLT and H/W cursor registers
- to be memory mapped 2Mb above the Base Address.
- (Max Ram: 1Mb, Max Dclk: 56MHz@3.3V,68MHz@5V)
-<tag>ct65546</tag>
- This chip is specially manufactured for Toshiba, and so documentation
- is not widely available. It is believed that this is really just a
- 65545 with a higher maximum dot-clock of 80MHz.
- (Max Ram: 1Mb?, Max Dclk: 80MHz?)
-<tag>ct65548</tag>
- This chip is similar to the 65545, but it also includes XRAM support
- and supports the higher dot clocks of the 65546.
- (Max Ram: 1Mb, Max Dclk: 80MHz)
-</descrip>
-
-<sect1>WinGine architecture<p>
-<descrip>
-<tag>ct64200</tag>
- This chip, also known as the WinGine, is used in video cards
- for desktop systems. It often uses external DAC's and programmable
- clock chips to supply additional functionally. None of these are
- currently supported within the driver itself, so many cards will only
- have limited support. Linear addressing is not supported for this
- card in the driver.
- (Max Ram: 2Mb, Max Dclk: 80MHz)
-<tag>ct64300</tag>
- This is a more advanced version of the WinGine chip, with specification
- very similar to the 6554x series of chips. However there are many
- differences at a register level. A similar level of acceleration to
- the 65545 is included for this driver.
- (Max Ram: 2Mb, Max Dclk: 80MHz)
-</descrip>
-
-<sect1>HiQV Architecture<p>
-<descrip>
-<tag>ct65550</tag>
- This chip includes many new features, including improved BitBLT
- support (24bpp colour expansion, wider maximum pitch, etc), Multimedia
- unit (video capture, zoom video port, etc) and 24bpp uncompressed true
- colour (i.e 32bpp mode). Also memory mapped I/O is possible on all bus
- configurations.
- (Max Ram: 2Mb, Max Dclk: 80MHz@3.3V,100MHz@5V)
-<tag>ct65554</tag>
- This chip is similar to the 65550 but has a 64bit memory bus as
- opposed to a 32bit bus. It also has higher limits on the maximum
- memory and pixel clocks
- (Max Ram: 4Mb, Max Dclk: 100MHz@3.3V)
-<tag>ct65555</tag>
- Similar to the 65554 but has yet higher maximum memory and pixel
- clocks. It also includes a new DSTN dithering scheme that improves
- the performance of DSTN screens.
- (Max Ram: 4Mb, Max Dclk: 110MHz@3.3V)
-<tag>ct68554</tag>
- Similar to the 65555 but also incorporates "PanelLink" drivers. This
- serial link allows an LCD screens to be located up to 100m from the
- video processor. Expect to see this chip soon in LCD desktop machines
- (Max Ram: 4Mb, Max Dclk: 110MHz@3.3V)
Reply to: