Attachment 871465 Details for Bug 1218240

[patch] A patch for the downstream patches in the xorg-x11-server

patches.patch (text/plain), 2.93 KB, created by Daniel Dadap on 2023-12-20 02:23:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Dadap

Created: 2023-12-20 02:23:48 UTC

Size: 2.93 KB

patch

obsolete

>diff -ur SOURCES.orig/n_xserver-optimus-autoconfig-hack.patch SOURCES/n_xserver-optimus-autoconfig-hack.patch
>--- SOURCES.orig/n_xserver-optimus-autoconfig-hack.patch	2019-09-18 07:48:11.000000000 -0500
>+++ SOURCES/n_xserver-optimus-autoconfig-hack.patch	2023-12-19 15:27:28.540042614 -0600
>@@ -62,7 +62,7 @@
>  #include "picturestr.h"
>  #include "randrstr.h"
>  #include "glxvndabi.h"
>-@@ -294,6 +295,231 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
>+@@ -294,6 +295,237 @@ AddVTAtoms(CallbackListPtr *pcbl, void *
>                     "Failed to register VT properties\n");
>  }
>  
>@@ -92,6 +92,9 @@
> +    } *outputConfigs;
> +    int outputConfigsCount = 0, outputConfigsUsed = 0;
> +
>++    if (!dixPrivateKeyRegistered(rrPrivKey))
>++        return;
>++
> +    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
> +    if (!pMasterScrPriv)
> +        return;
>@@ -253,6 +256,9 @@
> +    rrScrPrivPtr master_rp;
> +    rrScrPrivPtr slave_rp;
> +
>++    if (!dixPrivateKeyRegistered(rrPrivKey))
>++        return;
>++
> +    master_rp = rrGetScrPriv(master);
> +    slave_rp = rrGetScrPriv(slave);
> +
>diff -ur SOURCES.orig/u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch SOURCES/u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
>--- SOURCES.orig/u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch	2021-11-11 14:35:55.000000000 -0600
>+++ SOURCES/u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch	2023-12-19 18:52:48.136428316 -0600
>@@ -25,9 +25,13 @@
> ===================================================================
> --- xorg-server-21.1.0.orig/randr/randr.c
> +++ xorg-server-21.1.0/randr/randr.c
>-@@ -651,7 +651,9 @@ RRTellChanged(ScreenPtr pScreen)
>+@@ -650,8 +650,13 @@ RRTellChanged(ScreenPtr pScreen)
>+             pScrPriv->crtcs[i]->changed = FALSE;
>  
>          xorg_list_for_each_entry(iter, &primary->secondary_list, secondary_head) {
>++            if (!dixPrivateKeyRegistered(rrPrivKey)) {
>++                break;
>++            }
>              pSecondaryScrPriv = rrGetScrPriv(iter);
> -            pSecondaryScrPriv->provider->changed = FALSE;
> +            if (pSecondaryScrPriv->provider) {
>diff -ur SOURCES.orig/u_xfree86-activate-GPU-screens-on-autobind.patch SOURCES/u_xfree86-activate-GPU-screens-on-autobind.patch
>--- SOURCES.orig/u_xfree86-activate-GPU-screens-on-autobind.patch	2022-01-04 11:30:52.000000000 -0600
>+++ SOURCES/u_xfree86-activate-GPU-screens-on-autobind.patch	2023-12-19 18:42:02.105387746 -0600
>@@ -59,7 +59,7 @@
>  }
>  
>  static void
>-@@ -258,6 +263,186 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
>+@@ -258,6 +263,189 @@ AddVTAtoms(CallbackListPtr *pcbl, void *data, void *screen)
>                     "Failed to register VT properties\n");
>  }
>  
>@@ -90,6 +90,9 @@
> +    } *outputConfigs;
> +    int outputConfigsCount = 0, outputConfigsUsed = 0;
> +
>++    if (!dixPrivateKeyRegistered(rrPrivKey))
>++        return;
>++
> +    pMasterScrPriv = rrGetScrPriv(pMasterScreen);
> +    if (!pMasterScrPriv)
> +        return;

Actions: View | Diff

Attachments on bug 1218240: 871465