CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun 21 21:34:48 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c

Log Message:
fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.21
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20	Fri Jul 15 04:10:41 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Fri Jun 21 21:34:48 2024
@@ -952,6 +952,9 @@ inl(unsigned PORT_SIZE port)
 #endif
 
 #ifdef __alpha__
+
+#include 
+
 static inline int
 xf86ReadMmio8(void *Base, unsigned long Offset)
 {

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6	Sat Aug  5 06:03:26 2017
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c	Fri Jun 21 21:34:48 2024
@@ -212,26 +212,3 @@ xf86DisableIO()
 }
 
 #endif  /* USE_ALPHA_PIO */
-
-extern int readDense8(void *Base, register unsigned long Offset);
-extern int readDense16(void *Base, register unsigned long Offset);
-extern int readDense32(void *Base, register unsigned long Offset);
-extern void
- writeDense8(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense16(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense32(int Value, void *Base, register unsigned long Offset);
-
-void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
-= writeDense8;
-void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
-= writeDense16;
-void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
-= writeDense32;
-int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
-= readDense8;
-int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
-= readDense16;
-int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
-= readDense32;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun 21 21:34:48 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c

Log Message:
fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Jun 10 22:51:01 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c

Log Message:
make sure we fill in the name field in generated / converted modes
fixes PR 58321, tested by tsutsui@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8	Fri Jul 15 02:12:51 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c	Mon Jun 10 22:51:01 2024
@@ -818,6 +818,7 @@ xf86CVTMode(int HDisplay, int VDisplay, 
 Mode->VTotal = libxcvt_mode_info->vtotal;
 Mode->VRefresh   = libxcvt_mode_info->vrefresh;
 Mode->Flags  = libxcvt_mode_info->mode_flags;
+xf86SetModeDefaultName(Mode);
 
 free(libxcvt_mode_info);
 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Jun 10 22:51:01 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c

Log Message:
make sure we fill in the name field in generated / converted modes
fixes PR 58321, tested by tsutsui@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:23 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac

Log Message:
merge xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.16 xsrc/external/mit/xorg-server/dist/configure:1.17
--- xsrc/external/mit/xorg-server/dist/configure:1.16	Tue Feb  7 04:45:31 2023
+++ xsrc/external/mit/xorg-server/dist/configure	Thu Mar 30 23:04:22 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.7.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.8.
 #
 # Report bugs to .
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.7'
-PACKAGE_STRING='xorg-server 21.1.7'
+PACKAGE_VERSION='21.1.8'
+PACKAGE_STRING='xorg-server 21.1.8'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2000,7 +2000,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 21.1.7 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2071,7 +2071,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.7:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.8:";;
esac
   cat <<\_ACEOF
 
@@ -2256,10 +2256,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.7)
+  (default: 21.1.8)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.7)
+  CFBundleShortVersionString (default: 21.1.8)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2473,7 +2473,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.7
+xorg-server configure 21.1.8
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3130,7 +3130,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 21.1.7, which was
+It was created by xorg-server $as_me 21.1.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3887,7 +3887,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2023-02-07"
+RELEASE_DATE="2023-03-29"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -4405,7 +4405,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.7'
+ VERSION='21.1.8'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -25180,7 +25180,7 @@ if test ${with_bundle_version+y}
 then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else $as_nop
-   BUNDLE_VERSION="21.1.7"
+   BUNDLE_VERSION="21.1.8"
 fi
 
 
@@ -33749,7 +33749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 21.1.7, which was
+This file was extended by xorg-server $as_me 21.1.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -33817,7 +33817,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-xorg-server config.status 21.1.7
+xorg-server config.status 21.1.8
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.18 xsrc/external/mit/xorg-server/dist/configure.ac:1.19
--- xsrc/external/mit/xorg-server/d

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:23 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac

Log Message:
merge xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Dec 19 19:37:36 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/Xi: sendexev.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: generic.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h

Log Message:
fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/include/os.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
diff -u xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.5 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.6
--- xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.5	Mon Dec 31 09:49:58 2018
+++ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c	Mon Dec 19 19:37:36 2022
@@ -146,9 +146,6 @@ ProcXSendExtensionEvent(ClientPtr client
 if (stuff->num_events == 0)
 return ret;
 
-if (stuff->num_events == 0)
-return ret;
-
 /* The client's event type must be one defined by an extension. */
 
 first = ((xEvent *) &stuff[1]);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c:1.5	Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c	Mon Dec 19 19:37:36 2022
@@ -262,12 +262,6 @@ xf86ExtendedInitInt10(int entityIndex, i
strerror(err));
 goto error1;
 }
-#if 0 // XXXMRG was there in xorg-server 1.10
-	if (!int10_check_bios(screen, bios_location >> 4, vbiosMem)) {
-	xf86Msg(X_INFO, "No BIOS found\n");
-		goto error1;
-	}
-#endif
 }
 }
 

Index: xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
diff -u xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.8 xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.9
--- xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.8	Fri Jul 15 02:19:01 2022
+++ xsrc/external/mit/xorg-server/dist/include/dix-config.h.in	Mon Dec 19 19:37:36 2022
@@ -149,9 +149,6 @@
 /* Define to 1 if you have the `arc4random_buf' function. */
 #undef HAVE_ARC4RANDOM_BUF
 
-/* Define to 1 if you have the `arc4random_buf' function. */
-#undef HAVE_ARC4RANDOM_BUF
-
 /* Define to use libc SHA1 functions */
 #undef HAVE_SHA1_IN_LIBC
 

Index: xsrc/external/mit/xorg-server/dist/include/os.h
diff -u xsrc/external/mit/xorg-server/dist/include/os.h:1.11 xsrc/external/mit/xorg-server/dist/include/os.h:1.12
--- xsrc/external/mit/xorg-server/dist/include/os.h:1.11	Fri Jul 15 02:19:01 2022
+++ xsrc/external/mit/xorg-server/dist/include/os.h	Mon Dec 19 19:37:36 2022
@@ -225,16 +225,6 @@ extern _X_EXPORT int set_font_authorizat
  int *authlen,
  void *client);
 
-#if 0
-/*
- * These causes all sorts of warnings->errors in the xsrc build.
- */
-#ifdef __NetBSD__
-#undef _X_DEPRECATED
-#define _X_DEPRECATED
-#endif
-#endif
-
 /*
  * This function malloc(3)s buffer, terminating the server if there is not
  * enough memory.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Dec 19 19:37:36 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/Xi: sendexev.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: generic.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h

Log Message:
fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/include/os.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 12 08:18:29 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
avoid variable stack arrays.

USE_SSP=yes builds don't work with this new xorg-server version, adjust
the drmmode_set_gamma_lut() call to use malloc() instead of the stack,
and pass down a higher level pointer to gain access to the screen index
so error messages with xf86DrvMsg() work.

tested on pinebookpro.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.10 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.10	Wed Jul 20 03:51:16 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c	Fri Aug 12 08:18:29 2022
@@ -1736,16 +1736,23 @@ drmmode_show_cursor(xf86CrtcPtr crtc)
 }
 
 static void
-drmmode_set_gamma_lut(drmmode_crtc_private_ptr drmmode_crtc,
+drmmode_set_gamma_lut(xf86CrtcPtr crtc,
   uint16_t * red, uint16_t * green, uint16_t * blue,
   int size)
 {
+drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 drmmode_ptr drmmode = drmmode_crtc->drmmode;
 drmmode_prop_info_ptr gamma_lut_info =
 &drmmode_crtc->props[DRMMODE_CRTC_GAMMA_LUT];
 const uint32_t crtc_id = drmmode_crtc->mode_crtc->crtc_id;
 uint32_t blob_id;
-struct drm_color_lut lut[size];
+struct drm_color_lut *lut = malloc(sizeof(*lut) * size);
+
+if (lut == NULL) {
+xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
+   "Failed to allocate memory for %d LUT entries.\n", size);
+	return;
+}
 
 assert(gamma_lut_info->prop_id != 0);
 
@@ -1755,13 +1762,14 @@ drmmode_set_gamma_lut(drmmode_crtc_priva
 lut[i].blue = blue[i];
 }
 
-if (drmModeCreatePropertyBlob(drmmode->fd, lut, sizeof(lut), &blob_id))
-return;
+if (!drmModeCreatePropertyBlob(drmmode->fd, lut, sizeof(lut), &blob_id)) {
 
-drmModeObjectSetProperty(drmmode->fd, crtc_id, DRM_MODE_OBJECT_CRTC,
- gamma_lut_info->prop_id, blob_id);
+drmModeObjectSetProperty(drmmode->fd, crtc_id, DRM_MODE_OBJECT_CRTC,
+ gamma_lut_info->prop_id, blob_id);
 
-drmModeDestroyPropertyBlob(drmmode->fd, blob_id);
+drmModeDestroyPropertyBlob(drmmode->fd, blob_id);
+}
+free(lut);
 }
 
 static void
@@ -1772,7 +1780,7 @@ drmmode_crtc_gamma_set(xf86CrtcPtr crtc,
 drmmode_ptr drmmode = drmmode_crtc->drmmode;
 
 if (drmmode_crtc->use_gamma_lut) {
-drmmode_set_gamma_lut(drmmode_crtc, red, green, blue, size);
+drmmode_set_gamma_lut(crtc, red, green, blue, size);
 } else {
 drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 size, red, green, blue);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 12 08:18:29 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
avoid variable stack arrays.

USE_SSP=yes builds don't work with this new xorg-server version, adjust
the drmmode_set_gamma_lut() call to use malloc() instead of the stack,
and pass down a higher level pointer to gain access to the screen index
so error messages with xf86DrvMsg() work.

tested on pinebookpro.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 30 16:34:00 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Crtc.h

Log Message:
Pull an upstream (post-21.1) fix for xf86CompatOutput().

https://gitlab.freedesktop.org/xorg/xserver/-/commit/75d70612888f18339703315549db781a22c0cb23
This is an additional fix against the previous revision that is
avaiable in 21.1 branch:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/80eeff3ebac772e25c9107199989e677457dbe06
and may avoid a possible out of bounds access at least on dumb wsfb servers.

ok'ed by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h:1.1.1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h:1.1.1.7	Fri Jul 15 02:12:51 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h	Sat Jul 30 16:34:00 2022
@@ -837,11 +837,11 @@ extern _X_EXPORT int xf86CrtcConfigPriva
 static _X_INLINE xf86OutputPtr
 xf86CompatOutput(ScrnInfoPtr pScrn)
 {
-xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+xf86CrtcConfigPtr config;
 
 if (xf86CrtcConfigPrivateIndex == -1)
 return NULL;
-
+config = XF86_CRTC_CONFIG_PTR(pScrn);
 if (config->compat_output < 0)
 return NULL;
 return config->output[config->compat_output];

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 30 16:34:00 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Crtc.h

Log Message:
Pull an upstream (post-21.1) fix for xf86CompatOutput().

https://gitlab.freedesktop.org/xorg/xserver/-/commit/75d70612888f18339703315549db781a22c0cb23
This is an additional fix against the previous revision that is
avaiable in 21.1 branch:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/80eeff3ebac772e25c9107199989e677457dbe06
and may avoid a possible out of bounds access at least on dumb wsfb servers.

ok'ed by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 30 16:13:54 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86.h
xf86Globals.c xf86Helper.c xf86Init.c xf86Priv.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/doc: ddxDesign.xml
xsrc/external/mit/xorg-server/dist/hw/xfree86/man: Xorg.man
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.c

Log Message:
Restore -flipPixels option removed in upstream server-21.1-branch.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/d1c00c859c6676fbb540420c9055788bc19cb18f
Note ScrnInfoRec structure in hw/xfree86/common/xf86str.h isn't reverted
because it isn't used by -flipPixels option so that we can keep ABI
compatibility among xf86-video-foo drivers.

This -flipPixels is mandatory at least by Xorg server users with
xf86-video-wsfb driver on NetBSD/mac68k and SE/30 mono screen
that has "black=1 and white=0" VRAM.

"go for it" by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Init.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/doc/ddxDesign.xml
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/man/Xorg.man
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.5	Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h	Sat Jul 30 16:13:53 2022
@@ -79,6 +79,14 @@ extern _X_EXPORT Bool xf86DRI2Enabled(vo
 
 #define XF86SCRNINFO(p) xf86ScreenToScrn(p)
 
+#define XF86FLIP_PIXELS() \
+	do { \
+	if (xf86GetFlipPixels()) { \
+		pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \
+		pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \
+	   } \
+	while (0)
+
 #define BOOLTOSTRING(b) ((b) ? "TRUE" : "FALSE")
 
 /* Compatibility functions for pre-input-thread drivers */
@@ -278,6 +286,8 @@ xf86GetWeight(void);
 extern _X_EXPORT Gamma
 xf86GetGamma(void);
 extern _X_EXPORT Bool
+xf86GetFlipPixels(void);
+extern _X_EXPORT Bool
 xf86ServerIsExiting(void);
 extern _X_EXPORT Bool
 xf86ServerIsResetting(void);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c:1.1.1.7	Fri Jul 15 02:12:51 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c	Sat Jul 30 16:13:53 2022
@@ -188,6 +188,7 @@ int xf86FbBpp = -1;
 int xf86Depth = -1;
 rgb xf86Weight = { 0, 0, 0 };
 
+Bool xf86FlipPixels = FALSE;
 Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
 
 Bool xf86AllowMouseOpenFail = FALSE;
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h:1.1.1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h:1.1.1.7	Fri Jul 15 02:12:51 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h	Sat Jul 30 16:13:53 2022
@@ -69,6 +69,7 @@ extern _X_EXPORT char *xf86KeyboardName;
 extern _X_EXPORT int xf86FbBpp;
 extern _X_EXPORT int xf86Depth;
 extern _X_EXPORT rgb xf86Weight;
+extern _X_EXPORT Bool xf86FlipPixels;
 extern _X_EXPORT Gamma xf86Gamma;
 
 /* Other parameters */

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.6	Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c	Sat Jul 30 16:13:53 2022
@@ -952,8 +952,14 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int
 void
 xf86SetBlackWhitePixels(ScreenPtr pScreen)
 {
-pScreen->whitePixel = 1;
-pScreen->blackPixel = 0;
+if (xf86FlipPixels) {
+pScreen->white

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 30 16:13:54 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86.h
xf86Globals.c xf86Helper.c xf86Init.c xf86Priv.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/doc: ddxDesign.xml
xsrc/external/mit/xorg-server/dist/hw/xfree86/man: Xorg.man
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.c

Log Message:
Restore -flipPixels option removed in upstream server-21.1-branch.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/d1c00c859c6676fbb540420c9055788bc19cb18f
Note ScrnInfoRec structure in hw/xfree86/common/xf86str.h isn't reverted
because it isn't used by -flipPixels option so that we can keep ABI
compatibility among xf86-video-foo drivers.

This -flipPixels is mandatory at least by Xorg server users with
xf86-video-wsfb driver on NetBSD/mac68k and SE/30 mono screen
that has "black=1 and white=0" VRAM.

"go for it" by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Globals.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Priv.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Init.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/doc/ddxDesign.xml
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/man/Xorg.man
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 20 03:51:16 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
use PRIu64 and hopefully fix some clang builds.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.9	Fri Jul 15 05:08:55 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c	Wed Jul 20 03:51:16 2022
@@ -3921,11 +3921,11 @@ drmmode_crtc_upgrade_lut(xf86CrtcPtr crt
 crtc->gamma_blue = gamma + size * 2;
 
 xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, MS_LOGLEVEL_DEBUG,
-   "Gamma ramp set to %ld entries on CRTC %d\n",
+   "Gamma ramp set to %" PRIu64 " entries on CRTC %d\n",
size, num);
 } else {
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-   "Failed to allocate memory for %ld gamma ramp entries "
+   "Failed to allocate memory for %" PRIu64 " gamma ramp entries "
"on CRTC %d.\n",
size, num);
 return FALSE;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 20 03:51:16 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
use PRIu64 and hopefully fix some clang builds.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw

[Izumi Tsutsui]

> thanks.  i didn't want to go further than necessary to
> unbreak builds etc, but i did consider this too.

No problem, it's responsibility of the Tier-II maintainer(s)
to adapt MD (DDX) servers to DIX APIs.

Note both Xsun and X68k servers work at least on emulators
(though there is something wrong around the kernel scheduler
 that stops responding..).

---
Izumi Tsutsui

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw

[matthew green]

"Izumi Tsutsui" writes:
> Module Name:  xsrc
> Committed By: tsutsui
> Date: Sat Jul 16 00:02:18 UTC 2022
>
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
>   xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c
>
> Log Message:
> Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.
>
> https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> > These are so close to identical that most DDXes implement one in terms
> > of the other. All the relevant cases can be distinguished by the error
> > code, so merge the functions together to make things simpler.

thanks.  i didn't want to go further than necessary to
unbreak builds etc, but i did consider this too.


.mrg.m

CVS commit: xsrc/external/mit/xorg-server/dist/hw

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 16 00:02:18 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11	Fri Jul 15 19:10:11 2022
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sat Jul 16 00:02:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.12 2022/07/16 00:02:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -182,14 +182,14 @@ CloseInput(void)
 }
 
 /*-
- * function "AbortDDX" [ called by OS ]
+ * function "ddxGiveUp" [ called by DIX ]
  *
  *  purpose:  free signal handler and close frame buffers
  *  argument: ExitCode
  *  returns:  nothing
  *---*/
-static void
-AbortDDX(enum ExitCode error)
+void
+ddxGiveUp(enum ExitCode error)
 {
 int i;
 X68kScreenRec *screen;
@@ -208,19 +208,6 @@ AbortDDX(enum ExitCode error)
 }
 
 /*-
- * function "ddxGiveUp" [ called by DIX ]
- *
- *  purpose:  do nothing but call AbortDDX.
- *  argument: nothing
- *  returns:  nothing
- *---*/
-void
-ddxGiveUp(enum ExitCode error)
-{
-AbortDDX(error);
-}
-
-/*-
  * function "ddxProcessArgument"[ called by OS ]
  *
  *  purpose:  process X68k dependent arguments

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8	Fri Jul 15 19:10:11 2022
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Sat Jul 16 00:02:18 2022
@@ -155,11 +155,18 @@ sunEnqueueEvents(void)
 }
 }
 
-/*
- * DDX - specific abort routine.  Called by AbortServer().
- */
-static void
-AbortDDX(enum ExitCode error)
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
+/* Called by AbortServer(). */
+void
+ddxGiveUp(enum ExitCode error)
 {
 int		i;
 ScreenPtr	pScreen;
@@ -185,22 +192,6 @@ AbortDDX(enum ExitCode error)
 LogClose(error);
 }
 
-#if INPUTTHREAD
-/** This function is called in Xserver/os/inputthread.c when starting
-the input thread. */
-void
-ddxInputThreadInit(void)
-{
-}
-#endif
-
-/* Called by GiveUp(). */
-void
-ddxGiveUp(enum ExitCode error)
-{
-AbortDDX(error);
-}
-
 int
 ddxProcessArgument(int argc, char *argv[], int i)
 {

CVS commit: xsrc/external/mit/xorg-server/dist/hw

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 16 00:02:18 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
Merge AbortDDX() into ddxGiveUp() as other upstream DDX servers.

https://gitlab.freedesktop.org/xorg/xserver/-/commit/a23eba2a91024d27da45e5aee1f4215f7ec2ae82
> These are so close to identical that most DDXes implement one in terms
> of the other. All the relevant cases can be distinguished by the error
> code, so merge the functions together to make things simpler.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 19:10:11 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c x68kKbd.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c
xsrc/external/mit/xorg-server/dist/os: utils.c

Log Message:
couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
  it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
  -fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/os/utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10	Tue Dec  8 10:33:47 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -188,7 +188,7 @@ CloseInput(void)
  *  argument: ExitCode
  *  returns:  nothing
  *---*/
-void
+static void
 AbortDDX(enum ExitCode error)
 {
 int i;

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12	Wed Mar 17 15:02:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.13 2022/07/15 19:10:11 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -403,10 +403,4 @@ x68kSetLeds(X68kKbdPrivPtr pPriv, uint8_
 ErrorF("Failed to set keyboard lights\n");
 }
 
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-return TRUE;
-}
-
 /* EOF x68kKbd.c */

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7	Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Fri Jul 15 19:10:11 2022
@@ -158,7 +158,7 @@ sunEnqueueEvents(void)
 /*
  * DDX - specific abort routine.  Called by AbortServer().
  */
-void
+static void
 AbortDDX(enum ExitCode error)
 {
 int		i;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11	Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Fri Jul 15 19:10:11 2022
@@ -907,10 +907,3 @@ sunChangeKbdTranslation(int fd, Bool mak
 #endif /* } */
 return 0;
 }
-
-/*ARGSUSED*/
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-return TRUE;
-}

Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.12 xsrc/external/mit/xorg-server/dist/os/utils.c:1.13
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.12	Fri Jul 15 09:10:38 2022
+++ xsrc/external/mit/xorg-server/dist/os/utils.c	Fri Jul 15 19:10:11 2022
@@ -787,6 +787,7 @@ ProcessCommandLine(int argc, char *argv[
 UseMsg();
 }
 else if (strcmp(argv[i], "-fakescreenfps") == 0) {
+#ifdef PRESENT
 if (++i < argc) {
 FakeScreenFps = (uint32_t) atoi(argv[i]);
 if (FakeScreenFps < 1 || FakeScreenFps > 600)
@@ -794,6 +795,10 @@ ProcessCommandLine(int argc, char *argv[
 }
 else
 UseMsg();
+#else
+FatalError("fakescreenfps not available without PRESENT\n");
+UseMsg();
+#endif
 }
 else if (strcmp(argv[

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 19:10:11 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c x68kKbd.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c
xsrc/external/mit/xorg-server/dist/os: utils.c

Log Message:
couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
  it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
  -fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/os/utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:10:38 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: events.c
xsrc/external/mit/xorg-server/dist/os: connection.c utils.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle: Xquartz.plist

Log Message:
merge xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle/Xquartz.plist
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/xkb/xkb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.12 xsrc/external/mit/xorg-server/dist/configure:1.13
--- xsrc/external/mit/xorg-server/dist/configure:1.12	Fri Jul 15 02:18:56 2022
+++ xsrc/external/mit/xorg-server/dist/configure	Fri Jul 15 09:10:38 2022
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 21.1.3.
+# Generated by GNU Autoconf 2.69 for xorg-server 21.1.4.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.3'
-PACKAGE_STRING='xorg-server 21.1.3'
+PACKAGE_VERSION='21.1.4'
+PACKAGE_STRING='xorg-server 21.1.4'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -1971,7 +1971,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 21.1.3 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2042,7 +2042,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.3:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.4:";;
esac
   cat <<\_ACEOF
 
@@ -2227,10 +2227,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.3)
+  (default: 21.1.4)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.3)
+  CFBundleShortVersionString (default: 21.1.4)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2443,7 +2443,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.3
+xorg-server configure 21.1.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3152,7 +3152,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 21.1.3, which was
+It was created by xorg-server $as_me 21.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3500,7 +3500,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2022-01-02"
+RELEASE_DATE="2022-07-12"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -3709,12 +3709,7 @@ program_transform_name=`$as_echo "$progr
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -4019,7 +4014,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.3'
+ VERSION='21.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16337,11 +16332,11 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
   # to the OS version, if on x86, and 10.4, 

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 09:10:38 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: events.c
xsrc/external/mit/xorg-server/dist/os: connection.c utils.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle: Xquartz.plist

Log Message:
merge xorg-server 21.1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/bundle/Xquartz.plist
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/connection.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/xkb/xkb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Valery Ushakov writes:
> On Fri, Jul 15, 2022 at 05:08:56 +, matthew green wrote:
>
> > Modified Files:
> > xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
> > drmmode_display.c
> > 
> > Log Message:
> > use "1ULL << 32" for a 64 bit member, not 1UL.
>
> We should be able to use UINT64_C(1) here, or?

not for upstream-able.  ULL is wrong on systems where the
libdrm "__u64" isn't a long long, but a long, but it should
be OK as it built on both 32 / 64 for me.

thanks.


.mrg.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Valery Ushakov]

On Fri, Jul 15, 2022 at 05:08:56 +, matthew green wrote:

> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>   drmmode_display.c
> 
> Log Message:
> use "1ULL << 32" for a 64 bit member, not 1UL.

We should be able to use UINT64_C(1) here, or?

-uwe

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 06:03:39 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
make this actually build again on arm/mips.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 06:03:39 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
make this actually build again on arm/mips.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.15 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.16
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.15	Sun Jul  4 07:03:16 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Fri Jul 15 06:03:39 2022
@@ -61,7 +61,7 @@ volatile unsigned char *ioBase = MAP_FAI
 
 /* XXX why the hell is this necessary?! */
 #if defined(__arm__) || defined(__mips__)
-unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)(intptr_t)MAP_FAILED;
+unsigned int IOPortBase = (unsigned int)(intptr_t)MAP_FAILED;
 #endif
 
 Bool

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 05:08:56 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
use "1ULL << 32" for a 64 bit member, not 1UL.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 05:08:56 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c

Log Message:
use "1ULL << 32" for a 64 bit member, not 1UL.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.8	Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c	Fri Jul 15 05:08:55 2022
@@ -63,9 +63,9 @@ static PixmapPtr drmmode_create_pixmap_h
   void *pPixData);
 
 static const struct drm_color_ctm ctm_identity = { {
-1UL << 32, 0, 0,
-0, 1UL << 32, 0,
-0, 0, 1UL << 32
+1ULL << 32, 0, 0,
+0, 1ULL << 32, 0,
+0, 0, 1ULL << 32
 } };
 
 static Bool ctm_is_identity(const struct drm_color_ctm *ctm)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:10:41 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
fix merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.19 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.19	Fri Jul 15 02:18:59 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Fri Jul 15 04:10:41 2022
@@ -519,7 +519,6 @@ xf86WriteMmio32Le(__volatile__ void *bas
 }
 
 #elif defined(__mips__) || ((defined(__arm__) || defined(__arm32__)) && !defined(__linux__))
-#if defined(__arm__) || defined(__arm32__) || defined(__mips64)
 #define PORT_SIZE long
 
 extern _X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:10:41 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
fix merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 02:19:02 UTC 2022

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xext: saver.c shm.c vidmode.c xres.c
xtest.c
xsrc/external/mit/xorg-server/dist/Xi: xipassivegrab.c xiproperty.c
xiquerydevice.c xiselectev.c
xsrc/external/mit/xorg-server/dist/dbe: dbe.c dbestruct.h
xsrc/external/mit/xorg-server/dist/dix: devices.c dispatch.c dixfonts.c
enterleave.c events.c getevents.c globals.c pixmap.c region.c
window.c
xsrc/external/mit/xorg-server/dist/exa: exa_accel.c exa_priv.h
exa_unaccel.c
xsrc/external/mit/xorg-server/dist/fb: fbcmap_mi.c
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c indirect_util.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h xf86.h
xf86Bus.c xf86Config.c xf86Configure.c xf86DGA.c xf86Helper.c
xf86pciBus.c xf86str.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2: dri2.c dri2ext.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw: fbdevhw.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: generic.c
helper_exec.c xf86int10.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/loader: loader.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86RandR12.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
arm_video.c bsd_init.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu: prim_ops.c
xsrc/external/mit/xorg-server/dist/hw/xwin: winauth.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in dix.h
dixfont.h os.h
xsrc/external/mit/xorg-server/dist/mi: miarc.c miinitext.c miscrinit.c
xsrc/external/mit/xorg-server/dist/os: WaitFor.c access.c auth.c
backtrace.c connection.c io.c utils.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h
xsrc/external/mit/xorg-server/dist/render: render.c
xsrc/external/mit/xorg-server/dist/test: Makefile.am
xsrc/external/mit/xorg-server/dist/test/xi1:
protocol-xchangedevicecontrol.c
xsrc/external/mit/xorg-server/dist/test/xi2:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xfixes: cursor.c xfixes.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
Removed Files:
xsrc/external/mit/xorg-server/dist/dix: Xserver-dtrace.h.in Xserver.d
xsrc/external/mit/xorg-server/dist/hw/dmx: Makefile.am Makefile.in
dmx-config.h dmx.c dmx.h dmx_glxvisuals.c dmx_glxvisuals.h dmxcb.c
dmxcb.h dmxclient.h dmxcmap.c dmxcmap.h dmxcursor.c dmxcursor.h
dmxdpms.c dmxdpms.h dmxextension.c dmxextension.h dmxfont.c
dmxfont.h dmxgc.c dmxgc.h dmxgcops.c dmxgcops.h dmxinit.c dmxinit.h
dmxinput.c dmxinput.h dmxlog.c dmxlog.h dmxpict.c dmxpict.h
dmxpixmap.c dmxpixmap.h dmxprop.c dmxprop.h dmxscrinit.c
dmxscrinit.h dmxstat.c dmxstat.h dmxsync.c dmxsync.h dmxvisual.c
dmxvisual.h dmxwindow.c dmxwindow.h meson.build
xsrc/external/mit/xorg-server/dist/hw/dmx/config: Canvas.c Canvas.h
CanvasP.h Makefile.am Makefile.in TODO dmxcompat.c dmxcompat.h
dmxconfig.c dmxconfig.h dmxparse.c dmxparse.h dmxprint.c dmxprint.h
dmxtodmx.c meson.build parser.c parser.h parser.y scanner.c
scanner.l test-a.in test-a.out test-b.in test-b.out test-c.in
test-c.out test-d.in test-d.out test-e.in test-e.out test-f.in
test-f.out test-g.in test-g.out test-h.in test-h.out test-i.in
test-i.out test-j.in test-j.out test-k.in test-k.out test-l.in
test-l.out vdltodmx.c xdmxconfig.c
xsrc/external/mit/xorg-server/dist/hw/dmx/config/man: Makefile.am
Makefile.in dmxtodmx.man vdltodmx.man xdmxconfig.man
xsrc/external/mit/xorg-server/dist/hw/dmx/doc: DMXSpec-v1.txt
DMXSpec.txt Makefile.am Makefile.in dmx.xml scaled.xml
xsrc/external/mit/xorg-server/dist/hw/dmx/doxygen: Makefile.am
Makefile.in doxygen.conf.in footer.html
xsrc/external/mit/xorg-server/dist/hw/dmx/examples: Makefile.am
Makefile.in dmxaddinput.c dmxaddscreen.c dmxinfo.c dmxreconfig.c
dmxresize.c dmxrminput.c dmxrmscreen.c dmxwininfo.c ev.c evi.c
meson.build res.c xbell.c xinput.c xled.c xtest.c
xsrc/external/mit/xorg-server/dist/hw/dmx/glxProxy: Makefile.am
Makefile.in compsize.c compsize.h g_disptab.c g_dispta

CVS commit: xsrc/external/mit/xorg-server/dist/config

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Dec  5 21:14:13 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/config: wscons.c

Log Message:
Follow the error path if asprintf fails, not if it succeeds.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/config/wscons.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/config/wscons.c
diff -u xsrc/external/mit/xorg-server/dist/config/wscons.c:1.4 xsrc/external/mit/xorg-server/dist/config/wscons.c:1.5
--- xsrc/external/mit/xorg-server/dist/config/wscons.c:1.4	Tue Sep 28 07:20:54 2021
+++ xsrc/external/mit/xorg-server/dist/config/wscons.c	Sun Dec  5 21:14:12 2021
@@ -139,7 +139,7 @@ wscons_add_keyboard(void)
 input_options = input_option_new(input_options, "name", WSCONS_KBD_DEVICE);
 input_options = input_option_new(input_options, "driver", "kbd");
 
-if (asprintf(&config_info, "wscons:%s", WSCONS_KBD_DEVICE) != -1)
+if (asprintf(&config_info, "wscons:%s", WSCONS_KBD_DEVICE) == -1)
 goto unwind;
 if (KB_ENCODING(wsenc) == KB_USER) {
 /* Ignore wscons "user" layout */

CVS commit: xsrc/external/mit/xorg-server/dist/config

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Dec  5 21:14:13 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/config: wscons.c

Log Message:
Follow the error path if asprintf fails, not if it succeeds.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/config/wscons.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Fri Oct 22 19:22:43 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c

Log Message:
recognize Southland Media MGX


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.6	Tue Jan  1 00:40:01 2019
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c	Fri Oct 22 19:22:43 2021
@@ -63,7 +63,7 @@ struct sbus_devtable sbusDeviceTable[] =
 { SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", NULL, "Sun GS (cgtwelve)" },
 { SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "suncg14", "Sun SX" },
 { SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower" },
-{ SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus" },
+{ SBUS_DEVICE_MGX, FBTYPE_MGX, "mgx", "mgx", "Southland Media MGX" },
 { SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX" },
 { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX or S24" },
 { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Fri Oct 22 19:22:43 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c

Log Message:
recognize Southland Media MGX


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct 15 17:42:04 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c

Log Message:
Handle restoring keyboard state via AbortDevices() rather than AbortDDX().

Tested on 3/60.  Note AbortDevices() and DEVICE_ABORT in deviceProc
functions were introduced after Xorg 1.14.0:
 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6	Tue Dec  8 10:33:47 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Fri Oct 15 17:42:04 2021
@@ -163,17 +163,12 @@ AbortDDX(enum ExitCode error)
 {
 int		i;
 ScreenPtr	pScreen;
-DevicePtr	devPtr;
 
 #ifdef SVR4
 (void) OsSignal (SIGPOLL, SIG_IGN);
 #else
 (void) OsSignal (SIGIO, SIG_IGN);
 #endif
-if (sunKeyboardDevice) {
-devPtr = &sunKeyboardDevice->public;
-	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
-}
 #if defined(SVR4) || defined(CSRG_BASED)
 sunNonBlockConsoleOff ();
 #else

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10	Wed Mar 17 15:02:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Fri Oct 15 17:42:04 2021
@@ -669,7 +669,7 @@ sunKbdProc(DeviceIntPtr device, int what
 	 * Set the keyboard into "direct" mode and turn on
 	 * event translation.
 	 */
-	if (sunChangeKbdTranslation(pPriv->fd,TRUE) == -1)
+	if (sunChangeKbdTranslation(pPriv->fd, TRUE) == -1)
 	FatalError("Can't set keyboard translation\n");
 	SetNotifyFd(pPriv->fd, sunKbdHandlerNotify, X_NOTIFY_READ, NULL);
 	pKeyboard->on = TRUE;
@@ -687,13 +687,18 @@ sunKbdProc(DeviceIntPtr device, int what
 	/*
 	 * Restore original keyboard directness and translation.
 	 */
-	if (sunChangeKbdTranslation(pPriv->fd,FALSE) == -1)
+	if (sunChangeKbdTranslation(pPriv->fd, FALSE) == -1)
 	FatalError("Can't reset keyboard translation\n");
 	RemoveNotifyFd(pPriv->fd);
 	pKeyboard->on = FALSE;
 	break;
 
 case DEVICE_ABORT:
+	/*
+	 * Restore original keyboard directness and translation.
+	 */
+	pPriv = (sunKbdPrivPtr)pKeyboard->devicePrivate;
+	(void)sunChangeKbdTranslation(pPriv->fd, FALSE);
 	break;
 }
 return Success;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct 15 17:42:04 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c

Log Message:
Handle restoring keyboard state via AbortDevices() rather than AbortDDX().

Tested on 3/60.  Note AbortDevices() and DEVICE_ABORT in deviceProc
functions were introduced after Xorg 1.14.0:
 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/config

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 28 07:20:55 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/config: wscons.c

Log Message:
Switch to xf86-input-ws for mouse by default, to allow more advanced
input devices to Just Work.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/config/wscons.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/config/wscons.c
diff -u xsrc/external/mit/xorg-server/dist/config/wscons.c:1.3 xsrc/external/mit/xorg-server/dist/config/wscons.c:1.4
--- xsrc/external/mit/xorg-server/dist/config/wscons.c:1.3	Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/config/wscons.c	Tue Sep 28 07:20:54 2021
@@ -265,8 +265,8 @@ wscons_add_pointers(void)
 break;
 }
 }
-/* Add a default entry catching all other mux elements as "mouse" */
-wscons_add_pointer(WSCONS_MOUSE_PREFIX, "mouse", ATTR_POINTER);
+/* Add a default entry catching all other mux elements as "ws" */
+wscons_add_pointer(WSCONS_MOUSE_PREFIX, "ws", ATTR_POINTER);
 }
 
 int

CVS commit: xsrc/external/mit/xorg-server/dist/config

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 28 07:20:55 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/config: wscons.c

Log Message:
Switch to xf86-input-ws for mouse by default, to allow more advanced
input devices to Just Work.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/config/wscons.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:32:40 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
present.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h

Log Message:
merge xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randr.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/randr/randrstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.10 xsrc/external/mit/xorg-server/dist/configure:1.11
--- xsrc/external/mit/xorg-server/dist/configure:1.10	Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xorg-server/dist/configure	Mon Aug 23 22:32:40 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.12.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.12'
-PACKAGE_STRING='xorg-server 1.20.12'
+PACKAGE_VERSION='1.20.13'
+PACKAGE_STRING='xorg-server 1.20.13'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2045,7 +2045,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.20.12 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2116,7 +2116,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.12:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.13:";;
esac
   cat <<\_ACEOF
 
@@ -2307,10 +2307,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 1.20.12)
+  (default: 1.20.13)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 1.20.12)
+  CFBundleShortVersionString (default: 1.20.13)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2567,7 +2567,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.20.12
+xorg-server configure 1.20.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3276,7 +3276,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.20.12, which was
+It was created by xorg-server $as_me 1.20.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3624,7 +3624,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2021-07-08"
+RELEASE_DATE="2021-07-29"
 RELEASE_NAME="Lemon Pepper Chicken"
 
 
@@ -4138,7 +4138,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.20.12'
+ VERSION='1.20.13'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16502,7 +16502,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 	10.[012][,.]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
+	10.*|11.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
   esac
 ;;
@@ -23773,7 +23773,7 @@ _ACEOF
 if test "${with_bundle_version+set}" = set; then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else
-   BUNDLE_VERSION="1.20.12"
+   BUNDLE_VERSION="1.20.13"
 fi
 
 
@@ -33618,7 +33618,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was ext

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:32:40 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
present.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h

Log Message:
merge xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randr.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/randr/randrstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri Aug 30 15:57:00 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Try modesetting on x86, too.

Not the best option without functional GLAMOR, but it does work.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri Aug 30 15:57:00 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Try modesetting on x86, too.

Not the best option without functional GLAMOR, but it does work.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.14 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.15
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.14	Fri Aug 30 15:48:25 2019
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Fri Aug 30 15:57:00 2019
@@ -346,7 +346,9 @@ listPossibleVideoDrivers(XF86MatchedDriv
 xf86AddMatchedDriver(md, "modesetting");
 #endif
 
-#if defined(__NetBSD__) && (defined(__aarch64__) || defined(__arm__))
+#if defined(__NetBSD__) && \
+(defined(__aarch64__) || defined(__arm__) || \
+ defined(__i386__) || defined(__amd64__))
 xf86AddMatchedDriver(md, "modesetting");
 #endif
 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri Aug 30 15:48:25 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Match wsfb on x86, too.

When uefi booting without driver-specific GPU support, wsfb is the only
choice for a graphical driver.

While here, combine the wsfb cases.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri Aug 30 15:48:25 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c

Log Message:
Match wsfb on x86, too.

When uefi booting without driver-specific GPU support, wsfb is the only
choice for a graphical driver.

While here, combine the wsfb cases.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.13	Mon Jan 28 11:50:00 2019
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Fri Aug 30 15:48:25 2019
@@ -350,21 +350,18 @@ listPossibleVideoDrivers(XF86MatchedDriv
 xf86AddMatchedDriver(md, "modesetting");
 #endif
 
-#if !defined(__sun)
-/* Fallback to platform default frame buffer driver */
-#if !defined(__linux__) && defined(__sparc__)
-xf86AddMatchedDriver(md, "wsfb");
-#else
+#if defined(__linux__)
 xf86AddMatchedDriver(md, "fbdev");
 #endif
-#endif  /* !__sun */
 
 /* Fallback to platform default hardware */
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
 xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
 xf86AddMatchedDriver(md, "sunffb");
-#elif defined(__NetBSD__)
+#endif
+
+#if defined(__NetBSD__)
 xf86AddMatchedDriver(md, "wsfb");
 #endif
 }

CVS commit: xsrc/external/mit/xorg-server/dist/glx

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri May 31 18:01:11 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c glxdrawable.h
glxext.c

Log Message:
Undo local diff.

It was introduced as one of the patches fixing
https://bugs.freedesktop.org/show_bug.cgi?id=28181

This is marked fixed upstream, and was spotted on non-NetBSD, so it's
very likely to be unnecessary.

This diff was causing a double-free, causing Xorg to crash when closing
pkgsrc/emulators/{retroarch,nestopia}.
This is most likely a problem that became more evident from jemalloc
debug which is filling free'd memory with 0x5a5a5a...

Fixes PR xsrc/54246.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/glx/glxext.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.11 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.12
--- xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.11	Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/glxcmds.c	Fri May 31 18:01:11 2019
@@ -1137,7 +1137,6 @@ __glXDrawableInit(__GLXdrawable * drawab
 drawable->pDraw = pDraw;
 drawable->type = type;
 drawable->drawId = drawId;
-drawable->otherId = 0;
 drawable->config = config;
 drawable->eventMask = 0;
 
@@ -1172,10 +1171,8 @@ DoCreateGLXDrawable(ClientPtr client, __
  * Windows aren't refcounted, so track both the X and the GLX window
  * so we get called regardless of destruction order.
  */
-// XXXMRG xorg-server 1.10
-if (drawableId != glxDrawableId && (type == GLX_DRAWABLE_WINDOW /*|| type == GLX_DRAWABLE_PIXMAP*/) &&
+if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
 !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw))
-	/*pGlxDraw->destroy (pGlxDraw);*/
 return BadAlloc;
 
 return Success;

Index: xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
diff -u xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.6 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.7
--- xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h:1.6	Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h	Fri May 31 18:01:11 2019
@@ -53,7 +53,6 @@ struct __GLXdrawable {
 
 DrawablePtr pDraw;
 XID drawId;
-XID otherId; /* for glx1.3 we need to track the original Drawable as well */
 
 /*
  ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or

Index: xsrc/external/mit/xorg-server/dist/glx/glxext.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.7 xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.8
--- xsrc/external/mit/xorg-server/dist/glx/glxext.c:1.7	Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/glxext.c	Fri May 31 18:01:11 2019
@@ -97,15 +97,13 @@ DrawableGone(__GLXdrawable * glxPriv, XI
 {
 __GLXcontext *c, *next;
 
-if (glxPriv->type == GLX_DRAWABLE_WINDOW || glxPriv->type == GLX_DRAWABLE_PIXMAP) {
+if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
 /* If this was created by glXCreateWindow, free the matching resource */
-if (glxPriv->otherId) {
-XID other = glxPriv->otherId;
-glxPriv->otherId = 0;
-if (xid == other)
-FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
+if (glxPriv->drawId != glxPriv->pDraw->id) {
+if (xid == glxPriv->drawId)
+FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
 else
-FreeResourceByType(other, __glXDrawableRes, TRUE);
+FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
 }
 /* otherwise this window was implicitly created by MakeCurrent */
 }

CVS commit: xsrc/external/mit/xorg-server/dist/glx

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Fri May 31 18:01:11 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c glxdrawable.h
glxext.c

Log Message:
Undo local diff.

It was introduced as one of the patches fixing
https://bugs.freedesktop.org/show_bug.cgi?id=28181

This is marked fixed upstream, and was spotted on non-NetBSD, so it's
very likely to be unnecessary.

This diff was causing a double-free, causing Xorg to crash when closing
pkgsrc/emulators/{retroarch,nestopia}.
This is most likely a problem that became more evident from jemalloc
debug which is filling free'd memory with 0x5a5a5a...

Fixes PR xsrc/54246.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/glx/glxdrawable.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/glx/glxext.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/dist/os

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Wed May 15 18:29:21 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/os: backtrace.c

Log Message:
fix variable stack allocation for ssp


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/os/backtrace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/os/backtrace.c
diff -u xsrc/external/mit/xorg-server/dist/os/backtrace.c:1.1.1.5 xsrc/external/mit/xorg-server/dist/os/backtrace.c:1.2
--- xsrc/external/mit/xorg-server/dist/os/backtrace.c:1.1.1.5	Mon Dec 31 04:36:12 2018
+++ xsrc/external/mit/xorg-server/dist/os/backtrace.c	Wed May 15 14:29:21 2019
@@ -115,7 +115,7 @@ xorg_backtrace(void)
 void
 xorg_backtrace(void)
 {
-const int BT_SIZE = 64;
+#define BT_SIZE 64
 void *array[BT_SIZE];
 const char *mod;
 int size, i;

CVS commit: xsrc/external/mit/xorg-server/dist/os

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Wed May 15 18:29:21 UTC 2019

Modified Files:
xsrc/external/mit/xorg-server/dist/os: backtrace.c

Log Message:
fix variable stack allocation for ssp


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/os/backtrace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: xsrc/external/mit/xorg-server/dist

[Christos Zoulas]

They get compiled with c++ it seems and they get flagged as a duplicate typedef 
by clang. It is apparently legal to have multiple identical typedefs in c++11. 
See the previous build log for clang...

christos

> On Jan 23, 2019, at 7:30 PM, matthew green  wrote:
> 
> "Christos Zoulas" writes:
>> Module Name:xsrc
>> Committed By:christos
>> Date:Tue Jan 22 20:25:45 UTC 2019
>> 
>> Modified Files:
>>xsrc/external/mit/xorg-server/dist/glx: glxscreens.h
>>xsrc/external/mit/xorg-server/dist/include: glx_extinit.h
>> 
>> Log Message:
>> protect dup typedef.
> 
> why this?
> 
> i thought they were supposed to be not both included, and
> isn't it legal in modern C anyway, that at least one of
> these files will be compiled with (glxscreens.h is not
> installed), so i'd never expect a problem to happen..
> 
> thanks.
> 
> 
> .mrg.

re: CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

"Christos Zoulas" writes:
> Module Name:  xsrc
> Committed By: christos
> Date: Tue Jan 22 20:25:45 UTC 2019
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/glx: glxscreens.h
>   xsrc/external/mit/xorg-server/dist/include: glx_extinit.h
> 
> Log Message:
> protect dup typedef.

why this?

i thought they were supposed to be not both included, and
isn't it legal in modern C anyway, that at least one of
these files will be compiled with (glxscreens.h is not
installed), so i'd never expect a problem to happen..

thanks.


.mrg.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Christos Zoulas]

On Apr 8,  3:28am, r...@nerv.org (Ryo Shimizu) wrote:
-- Subject: Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/dri

| 
| Sorry for the late reply.
| I got it. I'll revert and apply Joerg's patch. thanks.
| 
| BTW, I have a question. uint64 is defined as unsigned long long on 
NetBSD/aarch64.
| but on other OS (Linux,FreeBSD), it seems that uint64 is defined as unsigned 
long.
| (grep 'AARCH64.*INT64_TYPE' 
/usr/src/external/bsd/llvm/dist/clang/test/Preprocessor/init.c)
| 
| Linux  long
| FreeBSDlong
| NetBSD long long
| OpenBSDlong long
| DARWIN long long
| 
| Which type should be better?

Please don't revert it. It is just fine. We'll change ours to be long too.

christos

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Ryo Shimizu]

>On Wed, Apr 04, 2018 at 10:59:18AM +1000, matthew green wrote:
>> Christos Zoulas writes:
>> > In article <21473.1522789...@splode.eterna.com.au>,
>> > matthew green   wrote:
>> > >"Ryo Shimizu" writes:
>> > >> Module Name:xsrc
>> > >> Committed By:   ryo
>> > >> Date:   Tue Apr  3 19:53:57 UTC 2018
>> > >> 
>> > >> Modified Files:
>> > >> 
>> > >> xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>> > >> driver.h present.c vblank.c
>> > >> 
>> > >> Log Message:
>> > >> Fix compile error on evbarm-aarch64. (incompatible pointer types
>> > >initializing 'present_get_ust_msc_ptr')
>> > >
>> > >sounds like this is a different error.  why isn't CARD64 a
>> > >uint64_t or similarly compatible for arm64?  this sounds
>> > >like a problem with the environemnt, and not something to
>> > >work around here.
>> > >
>> > >is _XSERVER64 not defined, or whatever it is?
>> > >
>> > >thanks.
>> > 
>> > Yes, the problem is the compiler but this is an X bug.
>> > 
>> > uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
>> > They are simply not exchangeable and the compiler has the right to define
>> > things this way. Well, I've complained to joerg to normalize it and make
>> > it like all other _LP64 platforms, but there is an embargo committing to
>> > llvm.
>> 
>> can we have a hack in the Makefile for arm64 and not
>> touch the sources (for everyone)?
>
>We can just make the warning non-fatal for now. Like the attached patch.
>
>Joerg

Sorry for the late reply.
I got it. I'll revert and apply Joerg's patch. thanks.

BTW, I have a question. uint64 is defined as unsigned long long on 
NetBSD/aarch64.
but on other OS (Linux,FreeBSD), it seems that uint64 is defined as unsigned 
long.
(grep 'AARCH64.*INT64_TYPE' 
/usr/src/external/bsd/llvm/dist/clang/test/Preprocessor/init.c)

Linuxlong
FreeBSD  long
NetBSD   long long
OpenBSD  long long
DARWIN   long long

Which type should be better?

-- 
ryo shimizu

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Joerg Sonnenberger]

On Wed, Apr 04, 2018 at 10:59:18AM +1000, matthew green wrote:
> Christos Zoulas writes:
> > In article <21473.1522789...@splode.eterna.com.au>,
> > matthew green   wrote:
> > >"Ryo Shimizu" writes:
> > >> Module Name: xsrc
> > >> Committed By:ryo
> > >> Date:Tue Apr  3 19:53:57 UTC 2018
> > >> 
> > >> Modified Files:
> > >>  xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
> > >>  driver.h present.c vblank.c
> > >> 
> > >> Log Message:
> > >> Fix compile error on evbarm-aarch64. (incompatible pointer types
> > >initializing 'present_get_ust_msc_ptr')
> > >
> > >sounds like this is a different error.  why isn't CARD64 a
> > >uint64_t or similarly compatible for arm64?  this sounds
> > >like a problem with the environemnt, and not something to
> > >work around here.
> > >
> > >is _XSERVER64 not defined, or whatever it is?
> > >
> > >thanks.
> > 
> > Yes, the problem is the compiler but this is an X bug.
> > 
> > uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
> > They are simply not exchangeable and the compiler has the right to define
> > things this way. Well, I've complained to joerg to normalize it and make
> > it like all other _LP64 platforms, but there is an embargo committing to
> > llvm.
> 
> can we have a hack in the Makefile for arm64 and not
> touch the sources (for everyone)?

We can just make the warning non-fatal for now. Like the attached patch.

Joerg
diff -r 22ec71aea77a 
external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
--- 
a/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile  
Wed Apr 04 06:30:09 2018 +
+++ 
b/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile  
Thu Apr 05 00:36:55 2018 +0200
@@ -29,3 +29,7 @@
 DRIVER_NO_FAKE_INCLUDE=# defined
 
 .include "../../../../../drivers/Makefile.xf86-driver"
+
+.if ${MACHINE_ARCH:Maarch64*}
+CWARNFLAGS.clang+= -Wno-error=incompatible-pointer-types
+.endif

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Christos Zoulas]

In article <15169.1522803...@splode.eterna.com.au>,
matthew green   wrote:
>Christos Zoulas writes:
>> In article <21473.1522789...@splode.eterna.com.au>,
>> matthew green   wrote:
>> >"Ryo Shimizu" writes:
>> >> Module Name:  xsrc
>> >> Committed By: ryo
>> >> Date: Tue Apr  3 19:53:57 UTC 2018
>> >> 
>> >> Modified Files:
>> >>   xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>> >>   driver.h present.c vblank.c
>> >> 
>> >> Log Message:
>> >> Fix compile error on evbarm-aarch64. (incompatible pointer types
>> >initializing 'present_get_ust_msc_ptr')
>> >
>> >sounds like this is a different error.  why isn't CARD64 a
>> >uint64_t or similarly compatible for arm64?  this sounds
>> >like a problem with the environemnt, and not something to
>> >work around here.
>> >
>> >is _XSERVER64 not defined, or whatever it is?
>> >
>> >thanks.
>> 
>> Yes, the problem is the compiler but this is an X bug.
>> 
>> uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
>> They are simply not exchangeable and the compiler has the right to define
>> things this way. Well, I've complained to joerg to normalize it and make
>> it like all other _LP64 platforms, but there is an embargo committing to
>> llvm.
>
>can we have a hack in the Makefile for arm64 and not
>touch the sources (for everyone)?
>
>what's the upstream version of this code like now?

We should upstream the fix. It is the correct change. There is no
easy Makefile hack. It will have to be ifdefs in the code, and no
ifdefs is better than ifdefs.

christos

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[maya]

Can we please fix it before someone argues it's too late to make
incompatible changes? :-)

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

Christos Zoulas writes:
> In article <21473.1522789...@splode.eterna.com.au>,
> matthew green   wrote:
> >"Ryo Shimizu" writes:
> >> Module Name:   xsrc
> >> Committed By:  ryo
> >> Date:  Tue Apr  3 19:53:57 UTC 2018
> >> 
> >> Modified Files:
> >>xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
> >>driver.h present.c vblank.c
> >> 
> >> Log Message:
> >> Fix compile error on evbarm-aarch64. (incompatible pointer types
> >initializing 'present_get_ust_msc_ptr')
> >
> >sounds like this is a different error.  why isn't CARD64 a
> >uint64_t or similarly compatible for arm64?  this sounds
> >like a problem with the environemnt, and not something to
> >work around here.
> >
> >is _XSERVER64 not defined, or whatever it is?
> >
> >thanks.
> 
> Yes, the problem is the compiler but this is an X bug.
> 
> uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
> They are simply not exchangeable and the compiler has the right to define
> things this way. Well, I've complained to joerg to normalize it and make
> it like all other _LP64 platforms, but there is an embargo committing to
> llvm.

can we have a hack in the Makefile for arm64 and not
touch the sources (for everyone)?

what's the upstream version of this code like now?


.mrg.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Christos Zoulas]

In article <21473.1522789...@splode.eterna.com.au>,
matthew green   wrote:
>"Ryo Shimizu" writes:
>> Module Name: xsrc
>> Committed By:ryo
>> Date:Tue Apr  3 19:53:57 UTC 2018
>> 
>> Modified Files:
>>  xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>>  driver.h present.c vblank.c
>> 
>> Log Message:
>> Fix compile error on evbarm-aarch64. (incompatible pointer types
>initializing 'present_get_ust_msc_ptr')
>
>sounds like this is a different error.  why isn't CARD64 a
>uint64_t or similarly compatible for arm64?  this sounds
>like a problem with the environemnt, and not something to
>work around here.
>
>is _XSERVER64 not defined, or whatever it is?
>
>thanks.

Yes, the problem is the compiler but this is an X bug.

uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
They are simply not exchangeable and the compiler has the right to define
things this way. Well, I've complained to joerg to normalize it and make
it like all other _LP64 platforms, but there is an embargo committing to
llvm.

christos

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[matthew green]

"Ryo Shimizu" writes:
> Module Name:  xsrc
> Committed By: ryo
> Date: Tue Apr  3 19:53:57 UTC 2018
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
>   driver.h present.c vblank.c
> 
> Log Message:
> Fix compile error on evbarm-aarch64. (incompatible pointer types initializing 
> 'present_get_ust_msc_ptr')

sounds like this is a different error.  why isn't CARD64 a
uint64_t or similarly compatible for arm64?  this sounds
like a problem with the environemnt, and not something to
work around here.

is _XSERVER64 not defined, or whatever it is?

thanks.


.mrg.

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Christos Zoulas]

On Feb 11,  9:17pm, m...@eterna.com.au (matthew green) wrote:
-- Subject: re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/com

| so, to enable warnings you have to fix the code, which will make
| updating it harder later.

It is just 4 lines, and the cast was wrong (it takes away volatile from
a pointer which is passed into a function that takes a volatile!). 

| can you just not enable the warnings?  i'm hoping to update this
| unfortunately some what out of date code base (xorg-server) soon,
| and going on what i've seen lately, basically *every local change*
| will cause conflicts.  i wish i was being hyperbolic :-(

So instead of fixing the bug, we should silence the warnings, just
because there is a slight chance that there will be a conflict in
a future import? I prefer to ask upstream to fix it, together with
the other bug I found the other day.

christos

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[matthew green]

Christos Zoulas writes:
> On Feb 10,  9:53pm, m...@eterna.com.au (matthew green) wrote:
> -- Subject: re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/com
> 
> | is this actually necessary for some reason?  if not, please avoid
> | changing this 3rd party code (which already will require significant
> | work when updating to the latest version.)
> 
> It is something that upstream should accept, and I don't see a way of
> fixing it otherwise unless I disable warnings on other code (like it
> is disabled on X code).

so, to enable warnings you have to fix the code, which will make
updating it harder later.

can you just not enable the warnings?  i'm hoping to update this
unfortunately some what out of date code base (xorg-server) soon,
and going on what i've seen lately, basically *every local change*
will cause conflicts.  i wish i was being hyperbolic :-(

thanks.


.mrg.

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Christos Zoulas]

On Feb 10,  9:53pm, m...@eterna.com.au (matthew green) wrote:
-- Subject: re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/com

| is this actually necessary for some reason?  if not, please avoid
| changing this 3rd party code (which already will require significant
| work when updating to the latest version.)

It is something that upstream should accept, and I don't see a way of
fixing it otherwise unless I disable warnings on other code (like it
is disabled on X code).

christos

re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[matthew green]

"Christos Zoulas" writes:
> Module Name:  xsrc
> Committed By: christos
> Date: Mon Feb  9 17:44:22 UTC 2015
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
> 
> Log Message:
> remove superfluous casts.

is this actually necessary for some reason?  if not, please avoid
changing this 3rd party code (which already will require significant
work when updating to the latest version.)

thanks.


.mrg.

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

> On Tue, Mar 04, 2014 at 12:11:59PM +, Izumi Tsutsui wrote:
> > Module Name:xsrc
> > Committed By:   tsutsui
> > Date:   Tue Mar  4 12:11:59 UTC 2014
> > 
> > Modified Files:
> > xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c
> > x68kGraph.c
> > 
> > Log Message:
> > Replace xalloc(), xrealloc() and xfree() with malloc(), realloc() and 
> > free().
> 
> Lack of error checking?

http://nxr.netbsd.org/xref/xsrc/external/mit/xorg-server/dist/include/os.h?r=1.6#76
http://nxr.netbsd.org/xref/xsrc/external/mit/xorg-server/dist/os/utils.c?r=1.6#1038

No luck anyway.

---
Izumi Tsutsui

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Joerg Sonnenberger]

On Tue, Mar 04, 2014 at 12:11:59PM +, Izumi Tsutsui wrote:
> Module Name:  xsrc
> Committed By: tsutsui
> Date: Tue Mar  4 12:11:59 UTC 2014
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c
>   x68kGraph.c
> 
> Log Message:
> Replace xalloc(), xrealloc() and xfree() with malloc(), realloc() and free().

Lack of error checking?

Joerg

Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Nick Hudson]

On Sunday 28 November 2010 10:27:02 Nick Hudson wrote:
> Module Name:  xsrc
> Committed By: skrll
> Date: Sun Nov 28 10:27:02 UTC 2010
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
> 
> Log Message:
> Fix merge and ARM define handling.

The diff was from mrg@ and tested my me on my cats.

NIck

Re: CVS commit: xsrc/external/mit/xorg-server/dist/glx

[Rafal Boni]

On Wed, Jul 22, 2009 at 06:12:10AM +, matthew green wrote:
> Module Name:  xsrc
> Committed By: mrg
> Date: Wed Jul 22 06:12:10 UTC 2009
> 
> Modified Files:
>   xsrc/external/mit/xorg-server/dist/glx: glxdri.c
> 
> Log Message:
> apply patch-am from pkgsrc modular-xorg-server:
> 
> date: 2009/06/24 17:25:36;  author: drochner;  state: Exp;  lines: +10 -89
> zero out a local variable, fixes random behaviour in case a DRI hw module
> cannot be loaded and the server falls back to software rendering, from
> Rafal Boni per mail to tech-x11

Ah, thanks... I meant to verify that this was a problem with the native
Xorg server but was short on time and had other problems with it on my
laptop and i386 beater machine which kept me from being able to test.

--rafal

-- 
  Time is an illusion; lunchtime, doubly so. |/\/\|   Rafal Boni
   -- Ford Prefect   |\/\/|  ra...@pobox.com