xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/linux/lnx_agp.c   |   20 --------------------
 hw/xfree86/os-support/shared/agp_noop.c |    6 ------
 hw/xfree86/os-support/solaris/sun_agp.c |   20 --------------------
 hw/xfree86/os-support/xf86_OSproc.h     |    1 -
 4 files changed, 47 deletions(-)

New commits:
commit a1c1f8b9d8ae778e542fbe0e9bf7d7a039d29070
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 13 17:34:47 2024 +0100

    xfree86: drop unused xf86EnableAGP()
    
    This function doesn't seem to be used anymore, neither inside the xserver,
    nor by any drivers - so it can be dropped.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1404>

diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 58c904afb..9bf1d2424 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -352,23 +352,3 @@ xf86UnbindGARTMemory(int screenNum, int key)
 
     return TRUE;
 }
-
-/* XXX Interface may change. */
-Bool
-xf86EnableAGP(int screenNum, CARD32 mode)
-{
-    agp_setup setup;
-
-    if (!GARTInit(screenNum) || acquiredScreen != screenNum)
-        return FALSE;
-
-    setup.agp_mode = mode;
-    if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {
-        xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "
-                   "AGPIOC_SETUP with mode %ld failed (%s)\n",
-                   (unsigned long) mode, strerror(errno));
-        return FALSE;
-    }
-
-    return TRUE;
-}
diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c
index da486c051..6f793353d 100644
--- a/hw/xfree86/os-support/shared/agp_noop.c
+++ b/hw/xfree86/os-support/shared/agp_noop.c
@@ -94,9 +94,3 @@ xf86UnbindGARTMemory(int screenNum, int key)
 {
     return FALSE;
 }
-
-Bool
-xf86EnableAGP(int screenNum, CARD32 mode)
-{
-    return FALSE;
-}
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index 8728e920e..02a6e1806 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -306,23 +306,3 @@ xf86UnbindGARTMemory(int screenNum, int key)
 
     return TRUE;
 }
-
-/* XXX Interface may change. */
-Bool
-xf86EnableAGP(int screenNum, CARD32 mode)
-{
-    agp_setup_t setup;
-
-    if (!GARTInit(screenNum) || (acquiredScreen != screenNum))
-        return FALSE;
-
-    setup.agps_mode = mode;
-    if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {
-        xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "
-                   "AGPIOC_SETUP with mode %x failed (%s)\n",
-                   (unsigned int) mode, strerror(errno));
-        return FALSE;
-    }
-
-    return TRUE;
-}
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index d6fc6ab83..ecffd9a75 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -157,7 +157,6 @@ extern _X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key);
 extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key,
                                          unsigned long offset);
 extern _X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key);
-extern _X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode);
 extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
 
 /* These routines are in shared/sigio.c and are not loaded as part of the