xserver-xorg-video-glint: Changes to 'upstream-unstable'
.gitignore | 70 +
COPYING | 109 ++
ChangeLog | 101 --
DRI.txt | 407 ----------
Makefile.am | 14
README | 2
README.pm3 | 2
configure.ac | 89 --
man/.gitignore | 2
man/Makefile.am | 59 -
man/glint.man | 25
src/.gitignore | 6
src/IBMramdac.c | 1
src/Makefile.am | 10
src/TIramdac.c | 1
src/glint.h | 34
src/glint_common.h | 64 -
src/glint_dga.c | 7
src/glint_dri.c | 1962 ----------------------------------------------------
src/glint_dri.h | 123 ---
src/glint_dripriv.h | 296 -------
src/glint_driver.c | 98 --
src/glint_regs.h | 21
src/glint_shadow.c | 2
src/pm2_accel.c | 1
src/pm2_dac.c | 9
src/pm2_video.c | 207 ++---
src/pm2ramdac.c | 1
src/pm2v_dac.c | 1
src/pm2vramdac.c | 1
src/pm3_accel.c | 15
src/pm3_dac.c | 6
src/pm3_regs.h | 2
src/pm3_video.c | 22
src/pm_accel.c | 5
src/pm_dac.c | 1
src/sx_accel.c | 3
src/tx_accel.c | 20
src/tx_dac.c | 1
39 files changed, 394 insertions(+), 3406 deletions(-)
New commits:
commit 0aaa00ac0d0304737e0a3fd79695537c6e3a07d4
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Sep 6 15:19:36 2011 -0400
xf86-video-glint 1.2.6
diff --git a/configure.ac b/configure.ac
index ffbca35..4765bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
- [1.2.5],
+ [1.2.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint],
[xf86-video-glint])
AC_CONFIG_SRCDIR([Makefile.am])
commit ca7c202da8d291eba9c68c149eb9530be1d66880
Author: Mark Kettenis <mark.kettenis@xs4all.nl>
Date: Tue Mar 1 07:32:26 2011 +0000
Fix uploading YV12 data to texture buffer on BE machines
On BE machines various hardware byteswapping options are used for the
framebuffer aperture. Which option gets used depends on the depth of the
framebuffer. Uploading YV12 data to the texture buffer is done through the
same aperture, but is always done in 32-bit wide units. Therefore the code
that does the uploading needs to take into account the byteswapping done by
the hardware. For 32bpp modes we can use the same code as on LE machines,
but 16bpp and 8bpp modes need their own versions.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/pm2_video.c b/src/pm2_video.c
index cc0b56e..957d985 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -1690,7 +1690,7 @@ Permedia2GetStill(ScrnInfoPtr pScrn,
}
static void
-CopyYV12LE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
+CopyYV12(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
{
int Y_size = width * height;
CARD8 *V = Y + Y_size;
@@ -1715,7 +1715,30 @@ CopyYV12LE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
#if X_BYTE_ORDER == X_BIG_ENDIAN
static void
-CopyYV12BE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
+CopyYV12_16(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
+{
+ int Y_size = width * height;
+ CARD8 *V = Y + Y_size;
+ CARD8 *U = V + (Y_size >> 2);
+ int pad = (pitch >> 2) - (width >> 1);
+ int x;
+
+ width >>= 1;
+
+ for (height >>= 1; height > 0; height--) {
+ for (x = 0; x < width; Y += 2, x++)
+ *dst++ = Y[1] + (V[x] << 8) + (Y[0] << 16) + (U[x] << 24);
+ dst += pad;
+ for (x = 0; x < width; Y += 2, x++)
+ *dst++ = Y[1] + (V[x] << 8) + (Y[0] << 16) + (U[x] << 24);
+ dst += pad;
+ U += width;
+ V += width;
+ }
+}
+
+static void
+CopyYV12_8(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
{
int Y_size = width * height;
CARD8 *V = Y + Y_size;
@@ -1737,7 +1760,7 @@ CopyYV12BE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
}
}
-#endif /* X_BYTE_ORDER == X_BIG_ENDIAN */
+#endif
static void
CopyFlat(CARD8 *src, CARD8 *dst, int width, int height, int pitch)
@@ -1835,17 +1858,24 @@ Permedia2PutImage(ScrnInfoPtr pScrn,
switch (id) {
case LE4CC('Y','V','1','2'):
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- CopyYV12LE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
- width, height, pPPriv->BufferStride);
-#else
- if (pGlint->FBDev)
- CopyYV12LE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+ switch(pGlint->HwBpp) {
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+ case 8:
+ case 24:
+ CopyYV12_8(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
width, height, pPPriv->BufferStride);
- else
- CopyYV12BE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+ break;
+ case 15:
+ case 16:
+ CopyYV12_16(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
width, height, pPPriv->BufferStride);
+ break;
#endif
+ default:
+ CopyYV12(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+ width, height, pPPriv->BufferStride);
+ break;
+ }
PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_YUYV, 1, 0);
break;
commit 97c9bdf9a396c5627c865d03cd0de91a7267a277
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Sat Dec 11 12:38:54 2010 +0000
Make pm2's xv driver collect options like all other drivers.
The current method of argument collection is to collect options from different
ports of a VideoAdaptor record. Specifically, the ports had to be named
'Input' for input options, and 'Output' for output options.
This resulted in three groups of options, requiring people to know what
VideoAdaptor does, both of which were not documented in the man page. If you
forgot to create a VideoAdaptor port, then the xv driver would just not work.
This patch makes the xv driver collect options from the screen, like every
single other driver. Input and Output prefixes are used for options where the
input and output ports have the same args (FramesPerSec, for example).
Documentation added for the change.
This is a step toward getting rid of VideoAdaptor, since only glint uses it
(and is probably the only one to have used it).
v2: Complain about Xv driver failing to load only if the user wanted Xv.
Don't use pGlint->Options, since glint is still initializing.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/man/glint.man b/man/glint.man
index 3bafcf4..3505e94 100644
--- a/man/glint.man
+++ b/man/glint.man
@@ -102,6 +102,30 @@ acceleration in general, but disables it for some special cases. Default: off.
.BI "Option \*qFireGL3000\*q \*q" boolean \*q
If you have a card of the same name, turn this on. Default: off.
.TP
+The Permedia 2 xv driver supports some additional options:
+.TP
+.BI "Option \*qDevice\*q \*q" string \*q
+A path to the Permedia 2 kernel driver. This is required for Xv support.
+.TP
+.BI "Option \*qInputBuffers\*q \*q" integer \*q
+Sets the number of buffers for incoming data. Minimum of 1, max of 2.
+.TP
+.BI "Option \*qInputFramesPerSec\*q \*q" integer \*q
+Expected frames per second for incoming data.
+.TP
+.BI "Option \*qInputEncoding\*q \*q" string \*q
+The encoding that input data will have.
+.TP
+.BI "Option \*qOutputBuffers\*q \*q" integer \*q
+This should probably set the number of buffers for outgoing data. It actually
+does nothing.
+.TP
+.BI "Option \*qOutputFramesPerSec\*q \*q" integer \*q
+Expected frames per second for outgoing data.
+.TP
+.BI "Option \*qOutputEncoding\*q \*q" string \*q
+The encoding to put output data in.
+.TP
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
diff --git a/src/pm2_video.c b/src/pm2_video.c
index 0c47d16..cc0b56e 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -199,28 +199,22 @@ static const Bool ColorBars = FALSE;
typedef enum {
OPTION_DEVICE,
- OPTION_FPS,
- OPTION_BUFFERS,
- OPTION_ENCODING,
- OPTION_EXPOSE /* obsolete, ignored */
+ OPTION_IN_FPS,
+ OPTION_IN_BUFFERS,
+ OPTION_IN_ENCODING,
+ OPTION_OUT_FPS,
+ OPTION_OUT_BUFFERS,
+ OPTION_OUT_ENCODING,
} OptToken;
-/* XXX These should be made const, and per-screen/adaptor copies processed. */
-static OptionInfoRec AdaptorOptions[] = {
+static const OptionInfoRec pm2Options[] = {
{ OPTION_DEVICE, "Device", OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
-};
-static OptionInfoRec InputOptions[] = {
- { OPTION_BUFFERS, "Buffers", OPTV_INTEGER, {0}, FALSE },
- { OPTION_FPS, "FramesPerSec", OPTV_INTEGER, {0}, FALSE },
- { OPTION_ENCODING, "Encoding", OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
-};
-static OptionInfoRec OutputOptions[] = {
- { OPTION_BUFFERS, "Buffers", OPTV_INTEGER, {0}, FALSE },
- { OPTION_EXPOSE, "Expose", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_FPS, "FramesPerSec", OPTV_INTEGER, {0}, FALSE },
- { OPTION_ENCODING, "Encoding", OPTV_STRING, {0}, FALSE },
+ { OPTION_IN_BUFFERS, "InputBuffers", OPTV_INTEGER, {0}, FALSE },
+ { OPTION_IN_FPS, "InputFramesPerSec", OPTV_INTEGER, {0}, FALSE },
+ { OPTION_IN_ENCODING, "InputEncoding", OPTV_STRING, {0}, FALSE },
+ { OPTION_OUT_BUFFERS, "OutputBuffers", OPTV_INTEGER, {0}, FALSE },
+ { OPTION_OUT_FPS, "OutputFramesPerSec", OPTV_INTEGER, {0}, FALSE },
+ { OPTION_OUT_ENCODING, "OutputEncoding", OPTV_STRING, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -2964,12 +2958,13 @@ Permedia2VideoInit(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
AdaptorPrivPtr pAPriv;
- pointer options[3];
DevUnion Private[PORTS];
XF86VideoAdaptorRec VAR[ADAPTORS];
XF86VideoAdaptorPtr VARPtrs[ADAPTORS];
Bool VideoIO = TRUE;
int i;
+ /* Glint is still intializing, so pGlint->Options is off-limits. */
+ OptionInfoPtr VidOpts;
switch (pGlint->Chipset) {
case PCI_VENDOR_TI_CHIP_PERMEDIA2:
@@ -2981,64 +2976,50 @@ Permedia2VideoInit(ScreenPtr pScreen)
return;
}
- options[0] = NULL; /* VideoAdaptor "input" subsection options */
- options[1] = NULL; /* VideoAdaptor "output" subsection options */
- options[2] = NULL; /* VideoAdaptor options */
-
- for (i = 0;; i++) {
- char *adaptor = NULL; /* receives VideoAdaptor section identifier */
-
- if (!options[0])
- options[0] = xf86FindXvOptions(pScreen->myNum, i, "input", &adaptor, options[2] ? NULL : &options[2]);
-
- if (!options[1])
- options[1] = xf86FindXvOptions(pScreen->myNum, i, "output", &adaptor, options[2] ? NULL : &options[2]);
-
- if (!adaptor) {
- if (!i) /* VideoAdaptor reference enables Xv vio driver */
- VideoIO = FALSE;
- break;
- } else if (options[0] && options[1])
- break;
- }
-
- if (VideoIO) {
- unsigned int temp;
- PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
- switch (temp) {
- case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
- case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
- case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
- case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C:
- break;
+ xf86CollectOptions(pScrn, NULL);
+ /* Process the options */
+ if (!(VidOpts = malloc(sizeof(pm2Options))))
+ return;
- default:
- xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
- VideoIO = FALSE;
+ memcpy(VidOpts, pm2Options, sizeof(pm2Options));
+
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, VidOpts);
+ xf86ShowUnusedOptions(pScrn->scrnIndex, VidOpts);
+
+ /* Don't complain about no Xv support unless they asked for Xv support.
+ Assume they want Xv if OPTION_DEVICE is set, since that's required. */
+ if (xf86IsOptionSet(VidOpts, OPTION_DEVICE)) {
+ unsigned int temp;
+ PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
+ switch (temp) {
+ case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
+ case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
+ case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
+ case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C:
+ break;
+ default:
+ VideoIO = FALSE;
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
+ }
}
+ else
+ /* Assume they don't, even if other options are set. */
+ VideoIO = FALSE;
+
+ if (pGlint->NoAccel && !VideoIO) {
+ free(VidOpts);
+ return;
}
- if (pGlint->NoAccel && !VideoIO)
- return;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Initializing Xv driver rev. 4\n");
- if (VideoIO) {
- for (i = 0; i <= 2; i++) {
- xf86ProcessOptions(pScrn->scrnIndex, options[i],
- (i == 0) ? InputOptions :
- (i == 1) ? OutputOptions :
- AdaptorOptions);
-
- xf86ShowUnusedOptions(pScrn->scrnIndex, options[i]);
- }
-
- if (xf86IsOptionSet(AdaptorOptions, OPTION_DEVICE)) {
- if (!xvipcOpen(xf86GetOptValString(AdaptorOptions, OPTION_DEVICE), pScrn))
+ if (VideoIO) {
+ if (!xvipcOpen(xf86GetOptValString(VidOpts, OPTION_DEVICE), pScrn))
VideoIO = FALSE;
- }
}
if (!(pAPriv = NewAdaptorPriv(pScrn, VideoIO))) {
+ free(VidOpts);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv driver initialization failed\n");
return;
}
@@ -3046,14 +3027,14 @@ Permedia2VideoInit(ScreenPtr pScreen)
if (VideoIO) {
int n;
- if (xf86GetOptValInteger(InputOptions, OPTION_BUFFERS, &n))
+ if (xf86GetOptValInteger(VidOpts, OPTION_IN_BUFFERS, &n))
pAPriv->Port[0].BuffersRequested = CLAMP(n, 1, 2);
- if (xf86GetOptValInteger(InputOptions, OPTION_FPS, &n))
+ if (xf86GetOptValInteger(VidOpts, OPTION_IN_FPS, &n))
pAPriv->Port[0].FramesPerSec = CLAMP(n, 1, 30);
- if (xf86GetOptValInteger(OutputOptions, OPTION_BUFFERS, &n))
+ if (xf86GetOptValInteger(VidOpts, OPTION_OUT_BUFFERS, &n))
pAPriv->Port[1].BuffersRequested = 1;
- if (xf86GetOptValInteger(OutputOptions, OPTION_FPS, &n))
+ if (xf86GetOptValInteger(VidOpts, OPTION_OUT_FPS, &n))
pAPriv->Port[1].FramesPerSec = CLAMP(n, 1, 30);
}
@@ -3073,7 +3054,7 @@ Permedia2VideoInit(ScreenPtr pScreen)
xf86InitFBManager(pScreen, &AvailFBArea);
}
-#if 0
+#if defined(XFree86LOADER) && 0
if (xf86LoaderCheckSymbol("xf86InitLinearFBManagerRegion")) {
int last = pGlint->FbMapSize / (pScrn->bitsPerPixel / 8) - 1;
BoxRec AvailFBArea;
@@ -3178,14 +3159,14 @@ Permedia2VideoInit(ScreenPtr pScreen)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv frontend scaler enabled\n");
if (VideoIO) {
- if ((s = xf86GetOptValString(InputOptions, OPTION_ENCODING)))
+ if ((s = xf86GetOptValString(VidOpts, OPTION_IN_ENCODING)))
for (i = 0; i < ENTRIES(InputVideoEncodings); i++)
if (!strncmp(s, InputVideoEncodings[i].name, strlen(s))) {
Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[0]);
break;
}
- if ((s = xf86GetOptValString(OutputOptions, OPTION_ENCODING)))
+ if ((s = xf86GetOptValString(VidOpts, OPTION_OUT_ENCODING)))
for (i = 0; i < ENTRIES(OutputVideoEncodings); i++)
if (!strncmp(s, OutputVideoEncodings[i].name, strlen(s))) {
Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[1]);
@@ -3199,4 +3180,6 @@ Permedia2VideoInit(ScreenPtr pScreen)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv initialization failed\n");
DeleteAdaptorPriv(pAPriv);
}
+
+ free(VidOpts);
}
commit d722b45848b899c5f4b7794871ef99207b8e7961
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Dec 4 13:14:31 2010 -0500
unifdef XFree86LOADER
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/glint_driver.c b/src/glint_driver.c
index bfd1ec8..ebe5c25 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -236,8 +236,6 @@ static RamDacSupportedInfoRec TIRamdacs[] = {
{ -1 }
};
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(glintSetup);
static XF86ModuleVersionInfo glintVersRec =
@@ -271,8 +269,6 @@ glintSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return NULL;
}
-#endif /* XFree86LOADER */
-
#define PARTPROD(a,b,c) (((a)<<6) | ((b)<<3) | (c))
static char bppand[4] = { 0x03, /* 8bpp */
diff --git a/src/pm2_video.c b/src/pm2_video.c
index df10bea..0c47d16 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -3073,7 +3073,7 @@ Permedia2VideoInit(ScreenPtr pScreen)
xf86InitFBManager(pScreen, &AvailFBArea);
}
-#if defined(XFree86LOADER) && 0
+#if 0
if (xf86LoaderCheckSymbol("xf86InitLinearFBManagerRegion")) {
int last = pGlint->FbMapSize / (pScrn->bitsPerPixel / 8) - 1;
BoxRec AvailFBArea;
commit 1b193cba02b6ca3e27bb72facaffcdd5fe57ba09
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Dec 4 13:11:00 2010 -0500
Add &component=Driver/glint to Bugzilla link
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/README b/README
index 1dee38f..04a7254 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ xf86-video-glint - GLINT/Permedia video driver for the Xorg X server
Please submit bugs & patches to the Xorg bugzilla:
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint
All questions regarding this software should be directed at the
Xorg mailing list:
diff --git a/configure.ac b/configure.ac
index 632ac8b..ffbca35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
[1.2.5],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint],
[xf86-video-glint])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit c34858ad8a7e6929ef5a432ff141d0ebb28c6874
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Dec 4 12:58:54 2010 -0500
Don't check for fontsproto.
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index 95b1d3e..632ac8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# 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(XORG, [xorg-server >= 1.0.99.901 xproto $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]),
HAVE_XEXTPROTO_71="no")
commit d343834fac2f413ab0f89841eb71f155682f2ac2
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Dec 4 12:58:23 2010 -0500
Add back mistakenly removed check for videoproto
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index c4d1f5e..95b1d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$libdir/xorg/modules"])
# Store the list of server defined optional extensions in REQUIRED_MODULES
+XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
commit f5609d296b46304495293bb6b3f48f806f3e16bf
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:51 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/README.pm3 b/README.pm3
index 4d6972e..ff443c8 100644
--- a/README.pm3
+++ b/README.pm3
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
-
STATUS as of Tue, 8 May 2001 19:01:39 +0200
Working :
diff --git a/man/glint.man b/man/glint.man
index 1a103f7..3bafcf4 100644
--- a/man/glint.man
+++ b/man/glint.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.5 2001/12/17 20:52:32 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH GLINT __drivermansuffix__ __vendorversion__
diff --git a/src/IBMramdac.c b/src/IBMramdac.c
index 2f73524..774a3e6 100644
--- a/src/IBMramdac.c
+++ b/src/IBMramdac.c
@@ -24,7 +24,6 @@
* glintOutIBMRGBIndReg() and glintInIBMRGBIndReg() are used to access
* the indirect IBM RAMDAC registers only.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.5 1998/08/29 14:34:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/TIramdac.c b/src/TIramdac.c
index b20223e..9fbaf44 100644
--- a/src/TIramdac.c
+++ b/src/TIramdac.c
@@ -27,7 +27,6 @@
* glintOutTIIndReg() and glintInTIIndReg() are used to access
* the indirect TI RAMDAC registers only.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.4 2001/01/31 16:14:52 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/glint.h b/src/glint.h
index b3949b2..f2a6fda 100644
--- a/src/glint.h
+++ b/src/glint.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.58tsi Exp $ */
/*
* Copyright 1997-2001 by Alan Hourihane <alanh@fairlite.demon.co.uk>
*
diff --git a/src/glint_dga.c b/src/glint_dga.c
index 8feb6c2..734f507 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.3 2001/04/10 20:33:30 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/glint_regs.h b/src/glint_regs.h
index cde8d8f..4fce62e 100644
--- a/src/glint_regs.h
+++ b/src/glint_regs.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
-
/*
* glint register file
*
diff --git a/src/glint_shadow.c b/src/glint_shadow.c
index 6b36a1b..1ad9cdd 100644
--- a/src/glint_shadow.c
+++ b/src/glint_shadow.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.0 1999/08/22 05:57:35 dawes Exp $ */
-
/*
Copyright (c) 1999, The XFree86 Project Inc.
Code adapted from mga/mga_shadow.c (Mark Vojkovich <markv@valinux.com>)
diff --git a/src/pm2_accel.c b/src/pm2_accel.c
index 53f804d..a8e136d 100644
--- a/src/pm2_accel.c
+++ b/src/pm2_accel.c
@@ -30,7 +30,6 @@
*
* Permedia 2 accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.30 2001/05/30 11:41:53 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm2_dac.c b/src/pm2_dac.c
index 3e5b53b..941ede6 100644
--- a/src/pm2_dac.c
+++ b/src/pm2_dac.c
@@ -28,7 +28,6 @@
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
* Siemens Nixdorf Informationssysteme
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.26tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm2_video.c b/src/pm2_video.c
index 58e4541..df10bea 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -20,8 +20,6 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
*/
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.25tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm2ramdac.c b/src/pm2ramdac.c
index 477f3a3..7a3e8a0 100644
--- a/src/pm2ramdac.c
+++ b/src/pm2ramdac.c
@@ -24,7 +24,6 @@
* Permedia2OutIndReg() and Permedia2InIndReg() are used to access
* the indirect Permedia2 RAMDAC registers only.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.10 1999/07/18 03:26:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm2v_dac.c b/src/pm2v_dac.c
index eea8a45..888cab7 100644
--- a/src/pm2v_dac.c
+++ b/src/pm2v_dac.c
@@ -27,7 +27,6 @@
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
* Siemens Nixdorf Informationssysteme
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.29tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm2vramdac.c b/src/pm2vramdac.c
index e728ad4..1f7eb08 100644
--- a/src/pm2vramdac.c
+++ b/src/pm2vramdac.c
@@ -24,7 +24,6 @@
* Permedia2vOutIndReg() and Permedia2vInIndReg() are used to access
* the indirect Permedia2v RAMDAC registers only.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.5 2001/01/30 10:06:35 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm3_accel.c b/src/pm3_accel.c
index 4170e30..0055a7b 100644
--- a/src/pm3_accel.c
+++ b/src/pm3_accel.c
@@ -1,4 +1,3 @@
-/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.5 2005/07/11 02:29:49 ajax Exp $ */
/*
* Copyright 2000-2001 by Sven Luther <luther@dpt-info.u-strasbg.fr>.
*
@@ -27,7 +26,6 @@
*
* Permedia 3 accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.30 2002/05/21 14:38:04 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index b99af0e..8e8609a 100644
--- a/src/pm3_dac.c
+++ b/src/pm3_dac.c
@@ -26,7 +26,6 @@
* this work is sponsored by Appian Graphics.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.33tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm3_regs.h b/src/pm3_regs.h
index be9fc51..257788d 100644
--- a/src/pm3_regs.h
+++ b/src/pm3_regs.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
-
/*
* glint register file
*
diff --git a/src/pm3_video.c b/src/pm3_video.c
index 6b4ad59..db68f09 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -22,7 +22,6 @@
* Authors: Alan Hourihane, alanh@fairlite.demon.co.uk
* Sven Luther <luther@dpt-info.u-strasbg.fr>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.14tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm_accel.c b/src/pm_accel.c
index 54bd142..28ccd88 100644
--- a/src/pm_accel.c
+++ b/src/pm_accel.c
@@ -28,7 +28,6 @@
*
* Permedia accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.24tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/pm_dac.c b/src/pm_dac.c
index 5f76d95..4437f33 100644
--- a/src/pm_dac.c
+++ b/src/pm_dac.c
@@ -27,7 +27,6 @@
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
* Siemens Nixdorf Informationssysteme
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.11tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/sx_accel.c b/src/sx_accel.c
index d8f8f52..adfb055 100644
--- a/src/sx_accel.c
+++ b/src/sx_accel.c
@@ -28,7 +28,6 @@
*
* GLINT 300SX accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.7 2001/05/29 11:23:38 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/tx_accel.c b/src/tx_accel.c
index 0ce04c8..5a02672 100644
--- a/src/tx_accel.c
+++ b/src/tx_accel.c
@@ -28,7 +28,6 @@
*
* GLINT 500TX / MX accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.27 2001/05/29 11:23:38 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/tx_dac.c b/src/tx_dac.c
index 0ad4ef1..abbe06a 100644
--- a/src/tx_dac.c
+++ b/src/tx_dac.c
@@ -27,7 +27,6 @@
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
* Siemens Nixdorf Informationssysteme
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.15tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
commit 0f943ec35255af41c8042a300cf73ecca35c9c55
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Sep 23 00:18:29 2010 -0400
Include xf86dgaproto.h, not xf86dgastr.h
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 6c78363..bfd1ec8 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -63,7 +63,7 @@
#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#endif
#include "globals.h"
commit b4acf1fb50f1560d177e8e7912ef27ddca80d209
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Sep 23 00:05:09 2010 -0400
Delete CFB
ajax killed cfb in April 2008 (0dab6fa3582b70ccd0f01459902415c28dbc81ff).
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index acef5c7..c4d1f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,6 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
[#include "xorg-server.h"])
-AC_CHECK_HEADER(cfb8_32.h,[AC_DEFINE(HAVE_CFB8_32, 1, [Have cfb8_32 support])],[])
CPPFLAGS="$SAVE_CPPFLAGS"
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
diff --git a/src/glint_driver.c b/src/glint_driver.c
index a0b378a..6c78363 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -2725,9 +2725,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
int ret, displayWidth;
-#if HAVE_CFB8_32
- int init_picture = 0;
-#endif
unsigned char *FBStart;
VisualPtr visual;
@@ -2819,30 +2816,11 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
case 8:
case 16:
case 24:
-#if !HAVE_CFB8_32
case 32:
-#endif
ret = fbScreenInit(pScreen, FBStart,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
displayWidth, pScrn->bitsPerPixel);
-#if HAVE_CFB8_32
- init_picture = 1;
- break;
- case 32:
- if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
- ret = cfb8_32ScreenInit(pScreen, FBStart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- displayWidth);
- else {
- ret = fbScreenInit(pScreen, FBStart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- displayWidth, pScrn->bitsPerPixel);
- init_picture = 1;
- }
-#endif
break;
default:
xf86DrvMsg(scrnIndex, X_ERROR,
@@ -2880,10 +2858,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
/* must be after RGB ordering fixed */
-#if HAVE_CFB8_32
- if (init_picture)
-#endif
- fbPictureInit(pScreen, 0, 0);
+ fbPictureInit(pScreen, 0, 0);
if (!pGlint->NoAccel) {
switch (pGlint->Chipset)
{
@@ -3011,14 +2986,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
}
-#if HAVE_CFB8_32
- if((pScrn->overlayFlags & OVERLAY_8_32_PLANAR) &&
- (pScrn->bitsPerPixel == 32)) {
- if(!xf86Overlay8Plus32Init(pScreen))
- return FALSE;
- }
-#endif
-
if(pGlint->ShadowFB)
ShadowFBInit(pScreen, GLINTRefreshArea);
commit 7669aeb2a170c246089043bb4d203c25cbfe5e95
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Sep 23 00:01:16 2010 -0400
Delete DRI/DRM
The DRM kernel component has been gone since at least 2.6.13, and Mesa dropped
the gamma driver in February 2010 (79aeafd3ca3680c28f6d47a21a501334844f4475).
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/DRI.txt b/DRI.txt
deleted file mode 100644
index 5bac4f3..0000000
--- a/DRI.txt
+++ /dev/null
@@ -1,407 +0,0 @@
-
- GLINT State Transition Strategy
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is granted to make and distribute verbatim copies
-of this document provided the copyright notice and this permission
-notice are preserved on all copies.
-
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
-
-GLINT State Transition Strategy
-
-Direct Rendering requires a coordinated method of state management
-across all drivers accessing this device. This document defines the
-expected behavior of all drivers participating in direct rendering with
-this device.
-
-Currently only the GMX2000 supports direct rendering.
-
-
Reply to: