diff -u xserver-xorg-video-savage-2.3.6/debian/changelog xserver-xorg-video-savage-2.3.6/debian/changelog --- xserver-xorg-video-savage-2.3.6/debian/changelog +++ xserver-xorg-video-savage-2.3.6/debian/changelog @@ -1,8 +1,17 @@ -xserver-xorg-video-savage (1:2.3.6-0ubuntu2) raring; urgency=low +xserver-xorg-video-savage (1:2.3.6-0ubuntu3) saucy; urgency=low * Rebuild to pick up new Xserver dependencies. - -- Timo Aaltonen Fri, 08 Feb 2013 11:59:10 +0200 + -- Maarten Lankhorst Wed, 22 May 2013 16:43:57 +0200 + +xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low + + * Fix EXA and use it by default (LP: 1083032) + - 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch + - 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch + - 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch + + -- Tormod Volden Tue, 07 May 2013 22:47:50 +0200 xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low diff -u xserver-xorg-video-savage-2.3.6/debian/patches/series xserver-xorg-video-savage-2.3.6/debian/patches/series --- xserver-xorg-video-savage-2.3.6/debian/patches/series +++ xserver-xorg-video-savage-2.3.6/debian/patches/series @@ -2,0 +3,3 @@ +110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +130-Really-fix-up-default-accel-arch-when-built-with-no-.patch only in patch2: unchanged: --- xserver-xorg-video-savage-2.3.6.orig/xserver-xorg-video-savage_2.3.6-0ubuntu2.debdiff +++ xserver-xorg-video-savage-2.3.6/xserver-xorg-video-savage_2.3.6-0ubuntu2.debdiff @@ -0,0 +1,142 @@ +diff -u xserver-xorg-video-savage-2.3.6/debian/changelog xserver-xorg-video-savage-2.3.6/debian/changelog +--- xserver-xorg-video-savage-2.3.6/debian/changelog ++++ xserver-xorg-video-savage-2.3.6/debian/changelog +@@ -1,3 +1,12 @@ ++xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low ++ ++ * Fix EXA and use it by default (LP: 1083032) ++ - 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++ - 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++ - 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch ++ ++ -- Tormod Volden Tue, 07 May 2013 22:47:50 +0200 ++ + xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low + + * Merge from unreleased debian git, remaining changes: +diff -u xserver-xorg-video-savage-2.3.6/debian/patches/series xserver-xorg-video-savage-2.3.6/debian/patches/series +--- xserver-xorg-video-savage-2.3.6/debian/patches/series ++++ xserver-xorg-video-savage-2.3.6/debian/patches/series +@@ -2,0 +3,3 @@ ++110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +@@ -0,0 +1,35 @@ ++From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 ++From: Dave Airlie ++Date: Sat, 22 Dec 2012 20:00:00 +1000 ++Subject: [PATCH] savage: fix default accel arch when built with no XAA ++ ++Signed-off-by: Dave Airlie ++--- ++ src/savage_driver.c | 4 ++++ ++ 1 file changed, 4 insertions(+) ++ ++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"); ++-- ++1.7.10.4 ++ +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +@@ -0,0 +1,43 @@ ++From ef43c3af8b3a354ea2cb3abf5cfa8f098c5006d1 Mon Sep 17 00:00:00 2001 ++From: Tormod Volden ++Date: Thu, 9 May 2013 12:36:33 +0000 ++Subject: [PATCH] Really fix up default accel arch when built with no XAA ++ ++After ca9718a887ecbc59b76869af673791ab591b849b it would ++still default to XAA unless AccelMethod option was used. ++ ++Signed-off-by: Tormod Volden ++--- ++ src/savage_driver.c | 6 +++--- ++ 1 file changed, 3 insertions(+), 3 deletions(-) ++ ++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"); ++ } ++-- ++1.7.9.5 ++ +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +@@ -0,0 +1,26 @@ ++From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001 ++From: Tormod Volden ++Date: Tue, 7 May 2013 22:41:31 +0200 ++Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr ++ ++Signed-off-by: Tormod Volden ++--- ++ src/savage_exa.c | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++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; ++ ++-- ++1.7.10.4 ++ only in patch2: unchanged: --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch @@ -0,0 +1,26 @@ +From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001 +From: Tormod Volden +Date: Tue, 7 May 2013 22:41:31 +0200 +Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + +Signed-off-by: Tormod Volden +--- + src/savage_exa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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; + +-- +1.7.10.4 + only in patch2: unchanged: --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch @@ -0,0 +1,43 @@ +From ef43c3af8b3a354ea2cb3abf5cfa8f098c5006d1 Mon Sep 17 00:00:00 2001 +From: Tormod Volden +Date: Thu, 9 May 2013 12:36:33 +0000 +Subject: [PATCH] Really fix up default accel arch when built with no XAA + +After ca9718a887ecbc59b76869af673791ab591b849b it would +still default to XAA unless AccelMethod option was used. + +Signed-off-by: Tormod Volden +--- + src/savage_driver.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +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"); + } +-- +1.7.9.5 + only in patch2: unchanged: --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch @@ -0,0 +1,35 @@ +From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Sat, 22 Dec 2012 20:00:00 +1000 +Subject: [PATCH] savage: fix default accel arch when built with no XAA + +Signed-off-by: Dave Airlie +--- + src/savage_driver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +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"); +-- +1.7.10.4 +