From fc7858a458dc47733ec37bbec9249d7c3a487d3c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 11 Jun 2025 13:36:45 -0700
Subject: [PATCH] Revert "randr: RRScreenInit(): drop unnecessary zero'ing"

This reverts commit 6fad884ce7c4767d2dd403ac8dfb8a6a107017ac.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012>
---
 randr/randr.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/randr/randr.c b/randr/randr.c
index 56fb453d2..b314f0411 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -315,6 +315,7 @@ RRScreenInit(ScreenPtr pScreen)
     /*
      * Calling function best set these function vectors
      */
+    pScrPriv->rrGetInfo = 0;
     pScrPriv->maxWidth = pScrPriv->minWidth = pScreen->width;
     pScrPriv->maxHeight = pScrPriv->minHeight = pScreen->height;
 
@@ -322,11 +323,21 @@ RRScreenInit(ScreenPtr pScreen)
     pScrPriv->height = pScreen->height;
     pScrPriv->mmWidth = pScreen->mmWidth;
     pScrPriv->mmHeight = pScreen->mmHeight;
+#if RANDR_12_INTERFACE
+    pScrPriv->rrScreenSetSize = NULL;
+    pScrPriv->rrCrtcSet = NULL;
+    pScrPriv->rrCrtcSetGamma = NULL;
+#endif
 #if RANDR_10_INTERFACE
+    pScrPriv->rrSetConfig = 0;
     pScrPriv->rotations = RR_Rotate_0;
     pScrPriv->reqWidth = pScreen->width;
     pScrPriv->reqHeight = pScreen->height;
+    pScrPriv->nSizes = 0;
+    pScrPriv->pSizes = NULL;
     pScrPriv->rotation = RR_Rotate_0;
+    pScrPriv->rate = 0;
+    pScrPriv->size = 0;
 #endif
 
     /*
@@ -341,6 +352,10 @@ RRScreenInit(ScreenPtr pScreen)
 
     pScreen->ConstrainCursorHarder = RRConstrainCursorHarder;
     pScreen->ReplaceScanoutPixmap = RRReplaceScanoutPixmap;
+    pScrPriv->numOutputs = 0;
+    pScrPriv->outputs = NULL;
+    pScrPriv->numCrtcs = 0;
+    pScrPriv->crtcs = NULL;
 
     xorg_list_init(&pScrPriv->leases);