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

This reverts commit c117925ace592529b0152efea3b1342399b31246.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
---
 hw/vfb/InitOutput.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 94a227b40..71ea78e2f 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -801,7 +801,8 @@ vfbCloseScreen(ScreenPtr pScreen)
     /*
      * fb overwrites miCloseScreen, so do this here
      */
-    dixDestroyPixmap(pScreen->devPrivate, 0);
+    if (pScreen->devPrivate)
+        (*pScreen->DestroyPixmap) (pScreen->devPrivate);
     pScreen->devPrivate = NULL;
 
     return pScreen->CloseScreen(pScreen);