configure.ac | 6 +
man/sis.man | 2
src/sis.h | 4 -
src/sis_driver.c | 167 ++++---------------------------------------------------
src/sis_video.c | 4 -
5 files changed, 25 insertions(+), 158 deletions(-)
New commits:
commit 9e50319293b10508bba4e3acef4a2851e7ab1f7a
Author: Dave Airlie <airl...@redhat.com>
Date: Thu Jul 30 12:04:29 2009 +1000
sis: bump for release 0.10.2
diff --git a/configure.ac b/configure.ac
index f19c1b7..079faa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.10.1,
+ 0.10.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
commit 8c3eca873717e877048c2bde345c02b1e9099e50
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
sis: change to using ABI version check
diff --git a/src/sis.h b/src/sis.h
index e859c78..400b83f 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -77,7 +77,7 @@
#include "xf86Pci.h"
#include "xf86Priv.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
#include "xf86.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index bb11cbb..994b02d 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -49,7 +49,7 @@
#include "sis.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#endif
#include "dixstruct.h"
commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:37 2009 +1000
sis: update for resources/RAC API removal
diff --git a/src/sis.h b/src/sis.h
index 773f709..e859c78 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -77,7 +77,9 @@
#include "xf86Pci.h"
#include "xf86Priv.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
#include "xf86.h"
#include "xf86PciInfo.h"
#include "xf86Cursor.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index a1ced97..bb11cbb 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -49,7 +49,9 @@
#include "sis.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
+#endif
#include "dixstruct.h"
#include "shadowfb.h"
#include "fb.h"
@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SiS_MapVGAMem(pScrn);
#endif
+#ifndef XSERVER_LIBPCIACCESS
/* Set operating state */
/* 1. memory */
@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
/* Operations for which I/O access is required */
pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+#endif
+
/* Load ramdac module */
if(!xf86LoadSubModule(pScrn, "ramdac")) {
SISErrorLog(pScrn, "Could not load ramdac module\n");
@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
(ULong)pSiS->IOAddress, pSiS->mmioSize);
+#ifndef XSERVER_LIBPCIACCESS
/* Register the PCI-assigned resources */
if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) {
SISErrorLog(pScrn, "PCI resource conflicts detected\n");
@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISFreeRec(pScrn);
return FALSE;
}
+#endif
from = X_PROBED;
if(pSiS->pEnt->device->videoRam != 0) {
commit 59ea80738d22c69a2850fd7ff89bd75330cc310b
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 16 11:55:25 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 089c5fa..f19c1b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
xf86dgaproto $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")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/sis_driver.c b/src/sis_driver.c
index ef7b522..a1ced97 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -78,8 +78,13 @@
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#ifdef XF86DRI
#include "dri.h"
commit 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
Author: Adam Jackson <a...@redhat.com>
Date: Thu May 28 15:19:25 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 5d0f51f..ef7b522 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -191,127 +191,6 @@ static PciChipsets XGIPciChipsets[] = {
{ -1, -1, RES_UNDEFINED }
};
-#ifdef SIS_USE_XAA
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAHelpPatternROP",
- "XAAInit",
- NULL
-};
-#endif
-
-#ifdef SIS_USE_EXA
-static const char *exaSymbols[] = {
- "exaDriverAccel",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- NULL
-};
-#endif
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- "xf86InterpretEDID",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *vbeSymbols[] = {
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
- "VBEInit",
-#else
- "VBEExtendedInit",
-#endif
- "vbeDoEDID",
- "vbeFree",
- "VBEGetVBEInfo",
- "VBEFreeVBEInfo",
- "VBEGetModeInfo",
- "VBEFreeModeInfo",
- "VBESaveRestore",
- "VBESetVBEMode",
- "VBEGetVBEMode",
- "VBESetDisplayStart",
- "VBESetGetLogicalScanlineLength",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpRelease",
- "drmAgpAlloc",
- "drmAgpFree",
- "drmAgpBase",
- "drmAgpBind",
- "drmAgpUnbind",
- "drmAgpEnable",
- "drmAgpGetMode",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmGetInterruptFromBusID",
-#ifndef SISHAVEDRMWRITE
- "drmSiSAgpInit",
-#else
- "drmCommandWrite",
-#endif
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
- "drmGetVersion",
- "drmFreeVersion",
-#endif
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICreateInfoRec",
- "DRIScreenInit",
- "DRIFinishScreenInit",
- "DRIDestroyInfoRec",
- "DRICloseScreen",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIUnlock",
- "DRIQueryVersion",
- "GlxSetVisualConfigs",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *driRefSymbols[] = {
- "DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */
- NULL
-};
-#endif
-#endif /* XF86DRI */
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(sisSetup);
@@ -347,19 +226,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int
*errmin)
if(!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols,
-#ifdef SIS_USE_XAA
- xaaSymbols,
-#endif
-#ifdef SIS_USE_EXA
- exaSymbols,
-#endif
- shadowSymbols, ramdacSymbols,
- vbeSymbols, int10Symbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols, driRefSymbols,
-#endif
- NULL);
return (pointer)TRUE;
}
@@ -2949,7 +2815,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn)
if(pSiS->pVbe) return;
if(xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index);
#else
@@ -3628,7 +3493,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Initializing adapter through int10\n");
if(xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
pSiS->pInt = xf86InitInt10(pSiS->pEnt->index);
} else {
SISErrorLog(pScrn, "Failed to load int10 module\n");
@@ -3718,8 +3582,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
goto my_error_1;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -6086,7 +5948,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
if(xf86LoadSubModule(pScrn, "ddc")) {
int crtnum = 0;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if((pMonitor = SiSDoPrivateDDC(pScrn, &crtnum))) {
didddc2 = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, ddcsstr, crtnum);
@@ -6119,8 +5980,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
-
/* Now load and initialize VBE module. */
SiS_LoadInitVBE(pScrn);
@@ -6957,18 +6816,15 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n",
pScrn->bitsPerPixel);
goto my_error_1;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load XAA/EXA (if needed) */
if(!pSiS->NoAccel) {
- const char **symNames = NULL;
#ifdef SIS_USE_XAA
if(!pSiS->useEXA) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
SISErrorLog(pScrn, "Could not load xaa module\n");
goto my_error_1;
}
- symNames = xaaSymbols;
}
#endif
#ifdef SIS_USE_EXA
@@ -6984,13 +6840,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
LoaderErrorMsg(NULL, "exa", errmaj, errmin);
goto my_error_1;
}
- symNames = exaSymbols;
}
#endif
- if(symNames) {
- xf86LoaderReqSymLists(symNames, NULL);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
- }
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
}
/* Load shadowfb (if needed) */
@@ -6999,7 +6851,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISErrorLog(pScrn, "Could not load shadowfb module\n");
goto my_error_1;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
/* Load the dri and glx modules if requested. */
@@ -7008,9 +6859,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
if(xf86LoadSubModule(pScrn, "dri")) {
if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
- if(xf86LoadSubModule(pScrn, "glx")) {
- xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
- } else {
+ if(!xf86LoadSubModule(pScrn, "glx")) {
SISErrorLog(pScrn, "Failed to load glx module\n");
}
}
commit 933dd8f860883c613acb5bcdf6b66100dbdfa952
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri May 1 16:57:22 2009 -0700
Correct bounds check of blitClip array access
Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes
are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS
[This bug was found by the Parfait bug checking tool.
For more information see http://research.sun.com/projects/parfait ]
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/src/sis_video.c b/src/sis_video.c
index 912a2f5..7322efb 100644
--- a/src/sis_video.c
+++ b/src/sis_video.c
@@ -4174,7 +4174,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULong index, Bool
shutdown)
* adapt->flags but we provide it anyway.
*/
- if(index > NUM_BLIT_PORTS) return;
+ if(index >= NUM_BLIT_PORTS) return;
REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]);
@@ -4214,7 +4214,7 @@ SISPutImageBlit(
SiS_Packet12_YUV MyPacket;
Bool first;
- if(index > NUM_BLIT_PORTS) return BadMatch;
+ if(index >= NUM_BLIT_PORTS) return BadMatch;
if(!height || !width) return Success;
commit 49c641b638ac36d2a559555c04a3bd2777c8d071
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri May 1 16:52:10 2009 -0700
Make sisRegs3D4 big enough to hold all values written to it
Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752)
writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20
[This bug was found by the Parfait bug checking tool.
For more information see http://research.sun.com/projects/parfait ]
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/src/sis.h b/src/sis.h
index 9bafd4b..773f709 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -747,7 +747,7 @@ typedef struct {
UChar sisRegsGR[10];
UChar sisDAC[768];
UChar sisRegs3C4[0x80];
- UChar sisRegs3D4[0xff];
+ UChar sisRegs3D4[0x100];
UChar sisRegs3C2;
UChar sisCapt[0x60];
UChar sisVid[0x50];
commit 5583c2342d873c0998ae73828246356867285460
Author: Chris Ball <c...@laptop.org>
Date: Fri Feb 27 10:57:35 2009 -0500
Revert "Build fixes for EXA3"
This reverts commit 7adc184e5e0f3df00423ea99b325d24764c1c067.
The EXA developers have backed out this ABI bump.
Signed-off-by: Chris Ball <c...@laptop.org>
diff --git a/configure.ac b/configure.ac
index 59df62c..089c5fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ fi
# technically this should be a configure flag. meh.
AC_DEFINE(XF86EXA, 1, [Build support for Exa])
-AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
diff --git a/src/sis300_accel.c b/src/sis300_accel.c
index a8fa373..503dee9 100644
--- a/src/sis300_accel.c
+++ b/src/sis300_accel.c
@@ -1365,9 +1365,6 @@ SiS300AccelInit(ScreenPtr pScreen)
return FALSE;
}
-#if EXA_VERSION_MAJOR < 3
- /* UploadToScratch has been dropped in EXA version 3. */
-
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16,
TRUE,
SiSScratchSave, pSiS);
@@ -1375,7 +1372,7 @@ SiS300AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-#endif
+
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
diff --git a/src/sis310_accel.c b/src/sis310_accel.c
index af9b9ad..8bba823 100644
--- a/src/sis310_accel.c
+++ b/src/sis310_accel.c
@@ -2399,9 +2399,6 @@ SiS315AccelInit(ScreenPtr pScreen)
return FALSE;
}
-#if EXA_VERSION_MAJOR < 3
- /* UploadToScratch has been dropped in EXA version 3. */
-
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16,
TRUE,
SiSScratchSave, pSiS);
@@ -2409,7 +2406,7 @@ SiS315AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-#endif
+
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
diff --git a/src/sis_accel.c b/src/sis_accel.c
index 82aee95..b85c893 100644
--- a/src/sis_accel.c
+++ b/src/sis_accel.c
@@ -880,9 +880,6 @@ SiSAccelInit(ScreenPtr pScreen)
return FALSE;
}
-#if EXA_VERSION_MAJOR < 3
- /* UploadToScratch has been dropped in EXA version 3. */
-
/* Reserve locked offscreen scratch area of 64K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 64 * 1024, 16, TRUE,
SiSScratchSave, pSiS);
@@ -890,7 +887,7 @@ SiSAccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-#endif
+
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
commit 7adc184e5e0f3df00423ea99b325d24764c1c067
Author: Chris Ball <c...@laptop.org>
Date: Tue Feb 24 12:32:01 2009 -0500
Build fixes for EXA3
* EXA in xserver head now requires -DEXA_DRIVER_KNOWN_MAJOR=3
* EXA3 drops the UploadToScratch hook, so guard it for < 3 only.
Signed-off-by: Chris Ball <c...@laptop.org>
diff --git a/configure.ac b/configure.ac
index 089c5fa..59df62c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ fi
# technically this should be a configure flag. meh.
AC_DEFINE(XF86EXA, 1, [Build support for Exa])
+AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
diff --git a/src/sis300_accel.c b/src/sis300_accel.c
index 503dee9..a8fa373 100644
--- a/src/sis300_accel.c
+++ b/src/sis300_accel.c
@@ -1365,6 +1365,9 @@ SiS300AccelInit(ScreenPtr pScreen)
return FALSE;
}
+#if EXA_VERSION_MAJOR < 3
+ /* UploadToScratch has been dropped in EXA version 3. */
+
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16,
TRUE,
SiSScratchSave, pSiS);
@@ -1372,7 +1375,7 @@ SiS300AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-
+#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
diff --git a/src/sis310_accel.c b/src/sis310_accel.c
index 8bba823..af9b9ad 100644
--- a/src/sis310_accel.c
+++ b/src/sis310_accel.c
@@ -2399,6 +2399,9 @@ SiS315AccelInit(ScreenPtr pScreen)
return FALSE;
}
+#if EXA_VERSION_MAJOR < 3
+ /* UploadToScratch has been dropped in EXA version 3. */
+
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16,
TRUE,
SiSScratchSave, pSiS);
@@ -2406,7 +2409,7 @@ SiS315AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-
+#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
diff --git a/src/sis_accel.c b/src/sis_accel.c
index b85c893..82aee95 100644
--- a/src/sis_accel.c
+++ b/src/sis_accel.c
@@ -880,6 +880,9 @@ SiSAccelInit(ScreenPtr pScreen)
return FALSE;
}
+#if EXA_VERSION_MAJOR < 3
+ /* UploadToScratch has been dropped in EXA version 3. */
+
/* Reserve locked offscreen scratch area of 64K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 64 * 1024, 16, TRUE,
SiSScratchSave, pSiS);
@@ -887,7 +890,7 @@ SiSAccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
-
+#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */
commit e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:34:01 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/sis.man b/man/sis.man
index d743fe6..c321808 100644
--- a/man/sis.man
+++ b/man/sis.man
@@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8.
none.
.SH "SEE ALSO"
#ifdef __xservername__
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
Xserver(__appmansuffix__), X(__miscmansuffix__)
#else
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
X(__miscmansuffix__)
#endif
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
