xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/misc/SlowBcopy.c |   25 -------------------------
 hw/xfree86/os-support/xf86_OSproc.h    |    1 -
 2 files changed, 26 deletions(-)

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

    xfree86: drop unused xf86SetReallySlowBcopy()
    
    This had been introduced almost two decades ago, by Dave Airlie (*1) along
    with some major IO speed improvement, just in case some driver still needed
    the old behaviour - in that case it would call xf86SetReallySlowBcopy(),
    so xf86SlowBcopy() would fall back to the old approach emitting an extra
    outb() on debug port, in order to slow things down more.
    
    Now aeons have passed and there doesn't seem to be any actual user for this,
    so it's time to drop that ancient relic.
    
    *1) commit e717eb82dc2e55f852919312d04f5cfc8ee55bc8
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1402>

diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index 9d82c71bf..d40bbd7c7 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -22,35 +22,10 @@
 #include "xf86_OSlib.h"
 #include "compiler.h"
 
-static int really_slow_bcopy;
-
-void
-xf86SetReallySlowBcopy(void)
-{
-    really_slow_bcopy = 1;
-}
-
-#if defined(__i386__) || defined(__amd64__)
-static void
-xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
-{
-    while (len--) {
-        *dst++ = *src++;
-        outb(0x80, 0x00);
-    }
-}
-#endif
-
 /* The outb() isn't needed on my machine, but who knows ... -- ost */
 void
 xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 {
-#if defined(__i386__) || defined(__amd64__)
-    if (really_slow_bcopy) {
-        xf86_really_slow_bcopy(src, dst, len);
-        return;
-    }
-#endif
     while (len--)
         *dst++ = *src++;
 }
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 8d61d8208..d6fc6ab83 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -119,7 +119,6 @@ extern _X_EXPORT void xf86SetTVOut(int);
 extern _X_EXPORT void xf86SetRGBOut(void);
 #endif
 extern _X_EXPORT void xf86OSRingBell(int, int, int);
-extern _X_EXPORT void xf86SetReallySlowBcopy(void);
 extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int);
 extern _X_EXPORT int xf86OpenSerial(XF86OptionPtr options);
 extern _X_EXPORT int xf86SetSerial(int fd, XF86OptionPtr options);