commit xf86-video-savage for openSUSE:12.3

Hello community, here is the log from the commit of package xf86-video-savage for openSUSE:12.3 checked in at 2013-03-04 17:34:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xf86-video-savage (Old) and /work/SRC/openSUSE:12.3/.xf86-video-savage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-savage", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/xf86-video-savage/xf86-video-savage.changes 2013-01-31 01:45:40.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xf86-video-savage.new/xf86-video-savage.changes 2013-03-04 17:35:00.000000000 +0100 @@ -1,0 +2,22 @@ +Sat Mar 2 04:09:27 UTC 2013 - sndirsch@suse.com + +- u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch + * Disable tiling on SuperSavage (Novell Bugzilla #805380) +- obsoletes + u_Disable-tiling-on-SuperSavage-IXC-64-Novell-Bugzilla.patch + +------------------------------------------------------------------- +Thu Feb 28 09:47:41 UTC 2013 - sndirsch@suse.com + +- u_Disable-tiling-on-SuperSavage-IXC-64-Novell-Bugzilla.patch + * disables tiling on SuperSavage/IXC 64 (bnc#805380) + +------------------------------------------------------------------- +Mon Feb 25 11:43:59 UTC 2013 - sndirsch@suse.com + +- U_savage-move-compat-api.h-down-to-proper-place.patch + * This screws up when DRI isn't enabled. +- U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch + * fix default accel arch when built with no XAA (bnc#805380?) + +------------------------------------------------------------------- New: ---- U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch U_savage-move-compat-api.h-down-to-proper-place.patch u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-savage.spec ++++++ --- /var/tmp/diff_new_pack.QCP8rW/_old 2013-03-04 17:35:00.000000000 +0100 +++ /var/tmp/diff_new_pack.QCP8rW/_new 2013-03-04 17:35:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-savage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,9 @@ Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch0: U_savage-move-compat-api.h-down-to-proper-place.patch +Patch1: U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch +Patch2: u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -52,6 +55,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure ++++++ U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++++++

From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 22 Dec 2012 20:00:00 +1000 Subject: [PATCH 2/2] 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 ++++++ U_savage-move-compat-api.h-down-to-proper-place.patch ++++++

From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 18 Jul 2012 18:52:38 +1000 Subject: [PATCH 1/2] savage: move compat-api.h down to proper place.

This screws up when DRI isn't enabled. Signed-off-by: Dave Airlie --- src/savage_driver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, -- 1.7.10.4 ++++++ u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch ++++++

From 924e9cafc7607d59577de3fb490e538b06e083c0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 2 Mar 2013 05:07:04 +0100 Subject: [PATCH] Disable tiling on SuperSavage (Novell Bugzilla #805380)

--- src/savage_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/savage_driver.c b/src/savage_driver.c index 5b49e60..b2e8174 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1668,7 +1668,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) #endif /* we can use Option "DisableTile TRUE" to disable tile mode */ - psav->bDisableTile = FALSE; + if (psav->Chipset == S3_SUPERSAVAGE) + /* apparently broken with these GPUs, see Novell Bugzilla #805380 */ + psav->bDisableTile = TRUE; + else + psav->bDisableTile = FALSE; if (xf86GetOptValBool(psav->Options, OPTION_DISABLE_TILE,&psav->bDisableTile)) { xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: %s Tile Mode and Program it \n",(psav->bDisableTile?"Disable":"Enable")); -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org