summarylogtreecommitdiffstats
path: root/git-fixes.patch
blob: 66fde4647f6fe8fe482d7c0f1573ff96115fa5df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
From de61497415e58a21fa247faf6db180ca47fb5df0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Wed, 27 Apr 2016 16:02:13 +0200
Subject: [PATCH 1/2] Disable tiling on SuperSavage by default

Xserver cannot be started with Tiling enabled on SuperSavage.
https://bugzilla.opensuse.org/show_bug.cgi?id=805380

Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
---
 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 d278345..58a294d 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 https://bugzilla.opensuse.org/show_bug.cgi?id=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"));
-- 
2.10.2


From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 19 Jul 2016 10:03:56 -0400
Subject: [PATCH 2/2] Adapt Block/WakeupHandler signature for ABI 23

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 src/compat-api.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/compat-api.h b/src/compat-api.h
index 98ba435..44daea4 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -78,11 +78,19 @@
 
 #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
 
 #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
 #define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
 
 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
 #define CLOSE_SCREEN_ARGS pScreen
-- 
2.10.2