xserver: Branch 'master'

[GitLab Mirror]

 dix/screenint_priv.h |    3 ---
 include/screenint.h  |    4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a66f99515ae81c2ea04242267f6c23249c9f08b4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 11:09:34 2024 +0100

    Revert "dix: unexport AttachOutputGPU() and DetachOutputGPU()"
    
    This reverts commit 1277bb7143b8c62842384d5947c35129c31a1e9f.
    
    Nvidia driver needs them for PRIME handling.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1371>

diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index 2d98d9ba9..87880e664 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -20,9 +20,6 @@ void RemoveGPUScreen(ScreenPtr pScreen);
 void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 void DetachUnboundGPU(ScreenPtr unbound);
 
-void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-void DetachOutputGPU(ScreenPtr output);
-
 void AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 void DetachOffloadGPU(ScreenPtr slave);
 
diff --git a/include/screenint.h b/include/screenint.h
index e136f31cf..fc313042d 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -53,6 +53,10 @@ typedef struct _PixmapFormat *PixmapFormatPtr;
 typedef struct _Visual *VisualPtr;
 typedef struct _Depth *DepthPtr;
 typedef struct _Screen *ScreenPtr;
+
+extern _X_EXPORT void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+extern _X_EXPORT void DetachOutputGPU(ScreenPtr output);
+
 typedef struct _ColormapRec *ColormapPtr;
 
 #endif                          /* SCREENINT_H */