From b91182cc163a5110065ed65c7f658b835d33af78 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 "dri3: use dixDestroyPixmap() instead of direct driver
 call"

This reverts commit 4694b8488eeee626016cc0eb9e22c8a758ec4d94.

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

diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 3da27b68f..cdb5a1f1e 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -244,7 +244,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client)
                   pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
 
     if (rc != Success) {
-        dixDestroyPixmap(pixmap, 0);
+        (*drawable->pScreen->DestroyPixmap) (pixmap);
         return rc;
     }
     if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap))
@@ -508,7 +508,7 @@ proc_dri3_pixmap_from_buffers(ClientPtr client)
                   pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
 
     if (rc != Success) {
-        dixDestroyPixmap(pixmap, 0);
+        (*screen->DestroyPixmap) (pixmap);
         return rc;
     }
     if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap))