xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/modes/xf86Crtc.h |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 80eeff3ebac772e25c9107199989e677457dbe06
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Oct 31 11:28:28 2021 +0100

    Make xf86CompatOutput() return NULL when there are no privates
    
    Some drivers (mach64 w/o DRI for instance) don't initialize privates.
    
    Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>

diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index fcba5c902..7a562874c 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -839,6 +839,9 @@ xf86CompatOutput(ScrnInfoPtr pScrn)
 {
     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 
+    if (xf86CrtcConfigPrivateIndex == -1)
+        return NULL;
+
     if (config->compat_output < 0)
         return NULL;
     return config->output[config->compat_output];