View | Details | Raw Unified | Return to bug 1218240
Collapse All | Expand All

(-)SOURCES.orig/n_xserver-optimus-autoconfig-hack.patch (-1 / +7 lines)
Lines 62-68 Link Here
62 
 #include "picturestr.h"
 62 
 #include "picturestr.h"
63 
 #include "randrstr.h"
 63 
 #include "randrstr.h"
64 
 #include "glxvndabi.h"
 64 
 #include "glxvndabi.h"
65 
@@ -294,6 +295,231 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
 65 
@@ -294,6 +295,237 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
66 
                    "Failed to register VT properties\n");
 66 
                    "Failed to register VT properties\n");
67 
 }
 67 
 }
68
68
Lines 92-97 Link Here
92 
+    } *outputConfigs;
 92 
+    } *outputConfigs;
93 
+    int outputConfigsCount = 0, outputConfigsUsed = 0;
 93 
+    int outputConfigsCount = 0, outputConfigsUsed = 0;
94 
+
 94 
+
95 
+    if (!dixPrivateKeyRegistered(rrPrivKey))
96 
+        return;
97 
+
95 
+    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
 98 
+    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
96 
+    if (!pMasterScrPriv)
 99 
+    if (!pMasterScrPriv)
97 
+        return;
 100 
+        return;
Lines 253-258 Link Here
253 
+    rrScrPrivPtr master_rp;
 256 
+    rrScrPrivPtr master_rp;
254 
+    rrScrPrivPtr slave_rp;
 257 
+    rrScrPrivPtr slave_rp;
255 
+
 258 
+
259 
+    if (!dixPrivateKeyRegistered(rrPrivKey))
260 
+        return;
261 
+
256 
+    master_rp = rrGetScrPriv(master);
 262 
+    master_rp = rrGetScrPriv(master);
257 
+    slave_rp = rrGetScrPriv(slave);
 263 
+    slave_rp = rrGetScrPriv(slave);
258 
+
 264 
+
(-)SOURCES.orig/u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch (-1 / +5 lines)
Lines 25-33 Link Here
25 
===================================================================
 25 
===================================================================
26 
--- xorg-server-21.1.0.orig/randr/randr.c
 26 
--- xorg-server-21.1.0.orig/randr/randr.c
27 
+++ xorg-server-21.1.0/randr/randr.c
 27 
+++ xorg-server-21.1.0/randr/randr.c
28 
@@ -651,7 +651,9 @@ RRTellChanged(ScreenPtr pScreen)
 28 
@@ -650,8 +650,13 @@ RRTellChanged(ScreenPtr pScreen)
29 
             pScrPriv->crtcs[i]->changed = FALSE;
29
30
30 
         xorg_list_for_each_entry(iter, &primary->secondary_list, secondary_head) {
 31 
         xorg_list_for_each_entry(iter, &primary->secondary_list, secondary_head) {
32 
+            if (!dixPrivateKeyRegistered(rrPrivKey)) {
33 
+                break;
34 
+            }
31 
             pSecondaryScrPriv = rrGetScrPriv(iter);
 35 
             pSecondaryScrPriv = rrGetScrPriv(iter);
32 
-            pSecondaryScrPriv->provider->changed = FALSE;
 36 
-            pSecondaryScrPriv->provider->changed = FALSE;
33 
+            if (pSecondaryScrPriv->provider) {
 37 
+            if (pSecondaryScrPriv->provider) {
(-)SOURCES.orig/u_xfree86-activate-GPU-screens-on-autobind.patch (-1 / +4 lines)
Lines 59-65 Link Here
59 
 }
 59 
 }
60
60
61 
 static void
 61 
 static void
62 
@@ -258,6 +263,186 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
 62 
@@ -258,6 +263,189 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
63 
                    "Failed to register VT properties\n");
 63 
                    "Failed to register VT properties\n");
64 
 }
 64 
 }
65
65
Lines 90-95 Link Here
90 
+    } *outputConfigs;
 90 
+    } *outputConfigs;
91 
+    int outputConfigsCount = 0, outputConfigsUsed = 0;
 91 
+    int outputConfigsCount = 0, outputConfigsUsed = 0;
92 
+
 92 
+
93 
+    if (!dixPrivateKeyRegistered(rrPrivKey))
94 
+        return;
95 
+
93 
+    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
 96 
+    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
94 
+    if (!pMasterScrPriv)
 97 
+    if (!pMasterScrPriv)
95 
+        return;
 98 
+        return;

Return to bug 1218240