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

This reverts commit 7ce19233bc1d9e3ba4f52de3470e4405730a293a.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
---
 Xext/saver.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index a91bc0aed..60b250fdd 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -277,10 +277,13 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
 static void
 FreeAttrs(ScreenSaverAttrPtr pAttr)
 {
+    PixmapPtr pPixmap;
     CursorPtr pCursor;
 
-    dixDestroyPixmap(pAttr->pBackgroundPixmap, 0);
-    dixDestroyPixmap(pAttr->pBorderPixmap, 0);
+    if ((pPixmap = pAttr->pBackgroundPixmap) != 0)
+        (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);
+    if ((pPixmap = pAttr->pBorderPixmap) != 0)
+        (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);
     if ((pCursor = pAttr->pCursor) != 0)
         FreeCursor(pCursor, (Cursor) 0);
 }