configure.ac | 2 +- debian/changelog | 6 ++++++ src/savage_driver.c | 9 ++++++--- src/savage_driver.h | 4 ++-- src/savage_exa.c | 2 +- src/savage_video.c | 8 ++++---- 6 files changed, 20 insertions(+), 11 deletions(-)
New commits: commit 6fdcef4a62b6693c571cdfd4b76e3a45fe320d50 Author: Maarten Lankhorst <[email protected]> Date: Thu Sep 26 15:44:20 2013 +0200 Actually upload with correct contents. (closes: #724675) diff --git a/debian/changelog b/debian/changelog index 06f27ab..51a28d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low + + * Actually upload with correct contents. (closes: #724675) + + -- Maarten Lankhorst <[email protected]> Thu, 26 Sep 2013 15:43:11 +0200 + xserver-xorg-video-savage (1:2.3.7-1) unstable; urgency=low * New upstream release that actually works. commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35 Author: Tormod Volden <[email protected]> Date: Tue Sep 24 23:14:35 2013 +0200 xf86-video-savage: bump to version 2.3.7 Signed-off-by: Tormod Volden <[email protected]> diff --git a/configure.ac b/configure.ac index 2b99314..a34e624 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-savage], - [2.3.6], + [2.3.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-savage]) AC_CONFIG_SRCDIR([Makefile.am]) commit 966a0e95d6c420e5e0ab01e665144e66a4004846 Author: Alexander Grothe <[email protected]> Date: Sun Sep 15 11:00:41 2013 +0200 Drop miInitializeBackingStore() call It was only needed up to xserver 1.4 and is not supported in the recent xserver versions. Thanks to Alexander Grothe for reporting the issue and providing the fix. https://bugs.freedesktop.org/show_bug.cgi?id=65444 > commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b > Author: Daniel Martin <[email protected]> > Date: Thu Sep 6 00:38:26 2012 +0200 > > dix: Delete mibstore.h > > Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to > define an empty function (miInitializeBackingStore()) for backward > compatibility. Time to say goodbye. Signed-off-by: Tormod Volden <[email protected]> diff --git a/src/savage_driver.c b/src/savage_driver.c index 4c8386d..bca2c60 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -3412,7 +3412,6 @@ static Bool SavageScreenInit(SCREEN_INIT_ARGS_DECL) SavageInitAccel(pScreen); } - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); if( !psav->shadowFB && !psav->useEXA ) commit 44581aef5f878e7f2b34d5693d50ef75263b195c Author: Tormod Volden <[email protected]> Date: Wed Feb 6 22:14:59 2013 +0100 Fix video window height on MX/IX/SuperSavage Some copy-pasto caused the width to be written into the height register. Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this was wrong. Signed-off-by: Tormod Volden <[email protected]> diff --git a/src/savage_video.c b/src/savage_video.c index 63958b7..81a5a82 100644 --- a/src/savage_video.c +++ b/src/savage_video.c @@ -1717,28 +1717,28 @@ SavageDisplayVideoNew( OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff ); OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); } else if (psav->IsPrimary) { OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff ); OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); } else { OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff ); OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); #if 0 OUTREG(SEC_STREAM2_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff ); OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); #endif } commit 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5 Author: Tormod Volden <[email protected]> Date: Thu May 9 12:39:58 2013 +0000 Fix building with TRACEON defined Signed-off-by: Tormod Volden <[email protected]> diff --git a/src/savage_driver.c b/src/savage_driver.c index 20c7094..4c8386d 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -2243,7 +2243,7 @@ static void SavageLeaveVT(VT_FUNC_ARGS_DECL) ScreenPtr pScreen; #endif - TRACE(("SavageLeaveVT(%d)\n", flags)); + TRACE(("SavageLeaveVT()\n")); gpScrn = pScrn; #ifdef SAVAGEDRI commit ac460e6836bdd2cd16c9d29743376c16fdc6924e Author: Tormod Volden <[email protected]> Date: Tue May 7 22:41:31 2013 +0200 exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr Signed-off-by: Tormod Volden <[email protected]> diff --git a/src/savage_exa.c b/src/savage_exa.c index 33c08c7..fd70c0c 100644 --- a/src/savage_exa.c +++ b/src/savage_exa.c @@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int Bool SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch) { - unsigned char *src = pSrc->devPrivate.ptr; + unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc); int src_pitch = exaGetPixmapPitch(pSrc); int bpp = pSrc->drawable.bitsPerPixel; commit c30f9b4a61283f21f6bd230950f52961afa203cf Author: Tormod Volden <[email protected]> Date: Thu May 9 12:36:33 2013 +0000 Really fix default accel arch when built with no XAA After ca9718a887ecbc59b76869af673791ab591b849b it would still default to XAA unless AccelMethod option was used. Make sure the default is EXA if there is no XAA support. Signed-off-by: Tormod Volden <[email protected]> diff --git a/src/savage_driver.c b/src/savage_driver.c index 5b49e60..20c7094 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1266,8 +1266,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) if(!psav->NoAccel) { from = X_DEFAULT; char *strptr; - if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { #ifdef HAVE_XAA_H + if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { if(!xf86NameCmp(strptr,"XAA")) { from = X_CONFIG; psav->useEXA = FALSE; @@ -1275,10 +1275,10 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) from = X_CONFIG; psav->useEXA = TRUE; } + } #else - psav->useEXA = TRUE; + psav->useEXA = TRUE; #endif - } xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", psav->useEXA ? "EXA" : "XAA"); } commit ca9718a887ecbc59b76869af673791ab591b849b Author: Dave Airlie <[email protected]> Date: Sat Dec 22 20:00:00 2012 +1000 savage: fix default accel arch when built with no XAA Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/savage_driver.c b/src/savage_driver.c index 026bf5c..5b49e60 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) from = X_DEFAULT; char *strptr; if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { +#ifdef HAVE_XAA_H if(!xf86NameCmp(strptr,"XAA")) { from = X_CONFIG; psav->useEXA = FALSE; @@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) from = X_CONFIG; psav->useEXA = TRUE; } +#else + psav->useEXA = TRUE; +#endif } xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", psav->useEXA ? "EXA" : "XAA"); commit 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Author: Dave Airlie <[email protected]> Date: Wed Jul 18 18:52:38 2012 +1000 savage: move compat-api.h down to proper place. This screws up when DRI isn't enabled. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/savage_driver.h b/src/savage_driver.h index b604292..ec4b1ea 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -85,8 +85,6 @@ #include "GL/glxint.h" #include "xf86drm.h" -#include "compat-api.h" - /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up * to 32 clients. */ #define SAVAGE_NUM_BUFFERS 32 @@ -153,6 +151,8 @@ typedef struct _server{ #endif +#include "compat-api.h" + typedef enum { MT_NONE, MT_CRT, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
