From 918a343710576972fdeb9804880f4d900319c9ff Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 11 Jun 2025 17:44:28 -0700
Subject: [PATCH] Revert "randr: use dixDestroyPixmap() instead of direct
 driver call"

This reverts commit d2a93d0346884e3bb51c4a4a15268d3b5d48f111.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
---
 randr/rrcrtc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 2fb92b053..42421b1ce 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -382,11 +382,11 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) {
          */
         PixmapUnshareSecondaryPixmap(pPixmap);
 
-        dixDestroyPixmap(pPixmap->primary_pixmap, 0);
-        dixDestroyPixmap(pPixmap->primary_pixmap, 0);
+        primary->DestroyPixmap(pPixmap->primary_pixmap);
+        primary->DestroyPixmap(pPixmap->primary_pixmap);
     }
 
-    dixDestroyPixmap(pPixmap, 0);
+    crtc->pScreen->DestroyPixmap(pPixmap);
 }
 
 void
@@ -440,7 +440,7 @@ rrCreateSharedPixmap(RRCrtcPtr crtc, ScreenPtr primary,
 
     spix = PixmapShareToSecondary(mpix, crtc->pScreen);
     if (spix == NULL) {
-        dixDestroyPixmap(mpix, 0);
+        primary->DestroyPixmap(mpix);
         return NULL;
     }