Module Name: xsrc
Committed By: mrg
Date: Tue Jan 1 00:34:53 UTC 2019
Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-ws/dist/src: emumb.c ws.h
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_video.c
radeon_video.h radeon_xvmc.c
xsrc/external/mit/xf86-video-ati-kms/include: config.h
xsrc/external/mit/xf86-video-ati/dist/src: compat-api.h
drmmode_display.c legacy_output.c radeon_atombios.c radeon_crtc.c
radeon_driver.c radeon_kms.c radeon_modes.c radeon_video.h
radeon_xvmc.c
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c
xsrc/external/mit/xf86-video-ati/xorg-server-copy: msp3430.c
xsrc/external/mit/xf86-video-geode/dist/src: geode.h lx_display.c
lx_driver.c lx_panel.c
xsrc/external/mit/xf86-video-glint/dist/src: pm2_video.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_display.c
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
vl_hwmc.c vl_hwmc.h
xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c
via_kms.c
xsrc/external/mit/xf86-video-trident/dist/src: trident_driver.c
xsrc/external/mit/xf86-video-vmware/dist/src: vmware.c vmwaremodes.c
Log Message:
fix various errors and warnings with xorg-server 1.20:
- no Error() in scope
- more wakeup/blockhandler ABI changes
- more notify fd API changes
- more xf86CursorResetCursor changes
- lots of char* -> const char*
- fix ati kms config.h now HAVE_XF86_CURSOR_RESET_CURSOR is available
- another xf86GetOS() is removed fix
- OsBlockSIGIO() etc, -> old, but still around API until properly converted
- don't free const char * data owned by some other system
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c \
xsrc/external/mit/xf86-input-ws/dist/src/ws.h
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-ati-kms/include/config.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h \
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.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/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.6 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.7
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.6 Wed Jan 8 12:48:41 2014
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Tue Jan 1 00:34:52 2019
@@ -338,7 +338,7 @@ xf86EloGetUnframedPacket(unsigned char *
* Okay, give up.
*/
if (num_bytes != ELO_UNFRAMED_SIZE) {
- Error("System error while reading from Elographics touchscreen.");
+ ErrorF("System error while reading from Elographics touchscreen.");
return !Success;
}
DBG(4, ErrorF("Read %d bytes\n", num_bytes));
Index: xsrc/external/mit/xf86-input-ws/dist/src/emumb.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.2 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.3
--- xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.2 Tue Aug 2 09:33:33 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/emumb.c Tue Jan 1 00:34:52 2019
@@ -279,8 +279,12 @@ wsmbEmuFilterEvent(InputInfoPtr pInfo, i
void
wsmbEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+/* XXX compat-api.h */
+ int i
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
+ , pointer LastSelectMask
+#endif
+ )
{
InputInfoPtr pInfo = (InputInfoPtr)data;
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
@@ -295,7 +299,9 @@ wsmbEmuWakeupHandler(pointer data,
void
wsmbEmuBlockHandler(pointer data,
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
struct timeval **waitTime,
+#endif
pointer LastSelectMask)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
@@ -306,7 +312,9 @@ wsmbEmuBlockHandler(pointer data,
ms = priv->emulateMB.expires - GetTimeInMillis();
if (ms <= 0)
ms = 0;
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
AdjustWaitForDelay(waitTime, ms);
+#endif
}
}
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.h
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.h:1.2 xsrc/external/mit/xf86-input-ws/dist/src/ws.h:1.3
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.h:1.2 Tue Aug 16 06:29:28 2016
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.h Tue Jan 1 00:34:52 2019
@@ -60,8 +60,14 @@ typedef struct WSDevice {
extern int wsmbEmuTimer(InputInfoPtr);
extern BOOL wsmbEmuFilterEvent(InputInfoPtr, int, BOOL);
+/* XXX compat-api.h */
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
extern void wsmbEmuWakeupHandler(pointer, int, pointer);
extern void wsmbEmuBlockHandler(pointer, struct timeval **, pointer);
+#else
+extern void wsmbEmuWakeupHandler(pointer, int);
+extern void wsmbEmuBlockHandler(pointer, pointer);
+#endif
extern void wsmbEmuPreInit(InputInfoPtr);
extern void wsmbEmuOn(InputInfoPtr);
extern void wsmbEmuFinalize(InputInfoPtr);
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c:1.1.1.7 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c:1.1.1.7 Sun Dec 30 07:33:49 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c Tue Jan 1 00:34:52 2019
@@ -173,7 +173,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(texturedAdaptor) {
- XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, (char *)texturedAdaptor->name);
+ XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, texturedAdaptor->name);
if(xvmcAdaptor) {
if(!xf86XvMCScreenInit(pScreen, 1, &xvmcAdaptor))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Failed to initialize extension.\n");
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h:1.1.1.4 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h:1.1.1.4 Sun Mar 5 03:35:31 2017
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h Tue Jan 1 00:34:52 2019
@@ -85,7 +85,7 @@ XF86VideoAdaptorPtr
RADEONSetupImageTexturedVideo(ScreenPtr pScreen);
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name);
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name);
void
RADEONCopyData(ScrnInfoPtr pScrn,
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c:1.1.1.1 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c:1.1.1.1 Sun Mar 1 04:52:46 2015
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c Tue Jan 1 00:34:52 2019
@@ -120,7 +120,7 @@ static XF86MCAdaptorRec adaptor_template
};
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name)
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name)
{
XF86MCAdaptorPtr adaptor;
ScrnInfoPtr pScrn;
Index: xsrc/external/mit/xf86-video-ati-kms/include/config.h
diff -u xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.8 xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.9
--- xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.8 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-ati-kms/include/config.h Tue Jan 1 00:34:52 2019
@@ -66,9 +66,8 @@
/* xextproto 7.1 available */
#define HAVE_XEXTPROTO_71 1
-// XXXMRG
/* Have xf86CursorResetCursor API */
-#undef HAVE_XF86_CURSOR_RESET_CURSOR
+#define HAVE_XF86_CURSOR_RESET_CURSOR 1
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
Index: xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.3 xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.3 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h Tue Jan 1 00:34:52 2019
@@ -38,6 +38,10 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
#endif
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0)
+#define HAVE_NOTIFY_FD 1
+#endif
+
#ifndef XF86_SCRN_INTERFACE
#define SCRN_ARG_TYPE int
Index: xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c:1.3 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c Tue Jan 1 00:34:52 2019
@@ -432,7 +432,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
if (pScrn->pScreen &&
!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(pScrn->pScreen);
+#else
xf86_reload_cursors(pScrn->pScreen);
+#endif
done:
if (!ret) {
@@ -1477,6 +1481,14 @@ drmmode_flip_handler(int fd, unsigned in
}
+#if HAVE_NOTIFY_FD
+static void drmmode_notify_fd(int fd, int notify, void *data)
+{
+ drmmode_ptr drmmode = data;
+
+ drmHandleEvent(fd, &drmmode->event_context);
+}
+#else
static void
drm_wakeup_handler(pointer data, int err, pointer p)
{
@@ -1487,6 +1499,7 @@ drm_wakeup_handler(pointer data, int err
drmHandleEvent(drmmode->fd, &drmmode->event_context);
}
}
+#endif
Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
{
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c:1.3 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c Tue Jan 1 00:34:52 2019
@@ -926,7 +926,7 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_AR
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RADEONInfoPtr info = RADEONPTR(pScrn);
int subPixelOrder = SubPixelUnknown;
- char* s;
+ const char* s;
void *front_ptr;
int ret;
Index: xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c:1.1.1.6 xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c:1.1.1.6 Sat Nov 20 10:00:25 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c Tue Jan 1 00:34:52 2019
@@ -228,7 +228,7 @@ RADEONGetLVDSInfo (ScrnInfoPtr pScrn, ra
{
RADEONInfoPtr info = RADEONPTR(pScrn);
radeon_native_mode_ptr native_mode = &lvds->native_mode;
- char* s;
+ const char* s;
if (!RADEONGetLVDSInfoFromBIOS(pScrn, lvds))
RADEONGetPanelInfoFromReg(pScrn, lvds);
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c:1.1.1.9 xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c:1.1.1.9 Sun Sep 23 19:49:25 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c Tue Jan 1 00:34:52 2019
@@ -1605,7 +1605,7 @@ rhdAtomParseI2CRecord(ScrnInfoPtr pScrn,
ATOM_I2C_RECORD *Record, int i)
{
RADEONInfoPtr info = RADEONPTR (pScrn);
- uint8_t *temp = &Record->sucI2cId;
+ uint8_t *temp = (uint8_t *)&Record->sucI2cId;
info->BiosConnector[i].i2c_line_mux = *temp;
info->BiosConnector[i].ucI2cId = *temp;
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.2 xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.3
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.2 Sun Sep 23 20:10:25 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c Tue Jan 1 00:34:52 2019
@@ -507,7 +507,11 @@ static void
radeon_crtc_mode_commit(xf86CrtcPtr crtc)
{
if (crtc->scrn->pScreen != NULL)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
}
void
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h:1.2 xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h:1.3
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h:1.2 Wed Aug 17 00:06:59 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h Tue Jan 1 00:34:52 2019
@@ -164,7 +164,7 @@ XF86VideoAdaptorPtr
RADEONSetupImageTexturedVideo(ScreenPtr pScreen);
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name);
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name);
void
RADEONCopyData(ScrnInfoPtr pScrn,
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.15 xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.16
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.15 Mon Dec 31 12:01:31 2018
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c Tue Jan 1 00:34:52 2019
@@ -2636,8 +2636,8 @@ static Bool RADEONPreInitXv(ScrnInfoPtr
uint16_t bios_header;
uint16_t pll_info_block;
#ifdef XvExtension
- char* microc_path = NULL;
- char* microc_type = NULL;
+ const char* microc_path = NULL;
+ const char* microc_type = NULL;
MessageType from;
if (xf86GetOptValInteger(info->Options, OPTION_VIDEO_KEY,
@@ -2871,7 +2871,7 @@ static void RADEONFixZaphodOutputs(ScrnI
RADEONInfoPtr info = RADEONPTR(pScrn);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
int o;
- char *s;
+ const char *s;
if ((s = xf86GetOptValString(info->Options, OPTION_ZAPHOD_HEADS))) {
for (o = config->num_output; o > 0; o--) {
@@ -3460,7 +3460,7 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_D
int hasDRI = 0;
#ifdef RENDER
int subPixelOrder = SubPixelUnknown;
- char* s;
+ const char* s;
#endif
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.1.1.4 xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.1.1.4 Sun Sep 23 19:49:27 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c Tue Jan 1 00:34:52 2019
@@ -258,7 +258,7 @@ static void RADEONAddScreenModes(xf86Out
DisplayModePtr first = NULL;
int count = 0;
int i, width, height;
- char **ppModeName = pScrn->display->modes;
+ const char **ppModeName = pScrn->display->modes;
first = last = *modeList;
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c:1.1.1.2 xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c:1.1.1.2 Sun Sep 23 19:49:01 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c Tue Jan 1 00:34:52 2019
@@ -120,7 +120,7 @@ static XF86MCAdaptorRec adaptor_template
};
XF86MCAdaptorPtr
-RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name)
+RADEONCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name)
{
XF86MCAdaptorPtr adaptor;
ScrnInfoPtr pScrn;
Index: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.3 Sat Nov 20 10:02:14 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Tue Jan 1 00:34:52 2019
@@ -215,6 +215,29 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
pParserTempData->IndirectData &= ~((0xFFFFFFFF >> (32-pParserTempData->IndirectIOTablePointer[1])) << pParserTempData->IndirectIOTablePointer[2]);
}
+/* from xorg-server 1.18 compiler.h */
+struct __una_u64 { uint64_t x __attribute__((packed)); };
+struct __una_u32 { uint32_t x __attribute__((packed)); };
+
+static __inline__ uint16_t ldw_u(uint16_t *p)
+{
+ uint16_t ret;
+ memmove(&ret, p, sizeof(*p));
+ return ret;
+}
+
+static __inline__ uint32_t ldl_u(uint32_t *p)
+{
+ uint32_t ret;
+ memmove(&ret, p, sizeof(*p));
+ return ret;
+}
+
+static __inline__ void stl_u(uint32_t val, uint32_t *p)
+{
+ struct __una_u32 *ptr = (struct __una_u32 *) p;
+ ptr->x = val;
+}
UINT32 IndirectInputOutput(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
{
Index: xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c
diff -u xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c:1.1 xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c:1.2
--- xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c:1.1 Tue Aug 16 07:38:15 2016
+++ xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c Tue Jan 1 00:34:52 2019
@@ -149,7 +149,7 @@ MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2
if(!I2C_WriteRead(&(m->d), NULL, 0, &a, 1))
{
- free(m->d.DevName);
+ free(__UNCONST(m->d.DevName));
free(m);
return NULL;
}
@@ -235,13 +235,13 @@ MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2
MSP_getProductName(m->chip_id), supported?"":" (unsupported)", rom_version, m->chip_id);
if (!supported) {
- free(m->d.DevName);
+ free(__UNCONST(m->d.DevName));
free(m);
return NULL;
}
if(!I2CDevInit(&(m->d)))
{
- free(m->d.DevName);
+ free(__UNCONST(m->d.DevName));
free(m);
return NULL;
}
Index: xsrc/external/mit/xf86-video-geode/dist/src/geode.h
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.5 xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.6
--- xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.5 Sat Aug 20 00:27:21 2016
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode.h Tue Jan 1 00:34:52 2019
@@ -465,7 +465,7 @@ void LXSetupOutput(ScrnInfoPtr);
/* lx_panel.c */
DisplayModePtr LXGetLegacyPanelMode(ScrnInfoPtr pScrni);
-DisplayModePtr LXGetManualPanelMode(char *modestr);
+DisplayModePtr LXGetManualPanelMode(const char *modestr);
void LXAdjustFrame(ADJUST_FRAME_ARGS_DECL);
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.5 xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.6
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.5 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c Tue Jan 1 00:34:52 2019
@@ -474,7 +474,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
pGeode->Output = OUTPUT_PANEL | OUTPUT_DCON;
}
else if (pGeode->Output & OUTPUT_PANEL) {
- char *pmode = xf86GetOptValString(GeodeOptions, LX_OPTION_PANEL_MODE);
+ const char *pmode = xf86GetOptValString(GeodeOptions, LX_OPTION_PANEL_MODE);
if (pmode != NULL)
pGeode->panelMode = LXGetManualPanelMode(pmode);
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c:1.2 xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c:1.2 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c Tue Jan 1 00:34:52 2019
@@ -326,7 +326,11 @@ lx_crtc_commit(xf86CrtcPtr crtc)
/* Load the cursor */
if (crtc->scrn->pScreen != NULL) {
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
crtc->funcs->hide_cursor(crtc);
crtc->cursor_shown = FALSE;
}
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c:1.2 xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c:1.2 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c Tue Jan 1 00:34:52 2019
@@ -112,7 +112,7 @@ LXGetLegacyPanelMode(ScrnInfoPtr pScrni)
/* Construct a moderec from the specified panel mode */
DisplayModePtr
-LXGetManualPanelMode(char *modestr)
+LXGetManualPanelMode(const char *modestr)
{
int clock;
int hactive, hsstart, hsend, htotal;
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c:1.3 Thu Sep 29 19:56:00 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c Tue Jan 1 00:34:52 2019
@@ -2595,16 +2595,10 @@ Permedia2ReadInput(int fd, pointer unuse
static Bool
xvipcOpen(const char *name, ScrnInfoPtr pScrn)
{
- const char *osname;
-
+#ifdef __linux__
if (xvipc_fd >= 0)
return TRUE;
- xf86GetOS(&osname, NULL, NULL, NULL);
-
- if (!osname || strcmp(osname, "linux"))
- return FALSE;
-
for (;;) {
DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
"XVIPC probing device %s\n", name));
@@ -2645,6 +2639,7 @@ xvipcOpen(const char *name, ScrnInfoPtr
xvipc_fd = -1;
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Cannot find Permedia 2 kernel driver.\n");
+#endif
return FALSE;
}
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.5 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.6
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.5 Thu Aug 18 18:48:58 2016
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Tue Jan 1 00:34:52 2019
@@ -4674,7 +4674,8 @@ sna_realize_cursor(xf86CursorInfoPtr inf
return NULL;
}
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
+/* XXXMRG OsBlockSIGIO() is gone gone, old one remains before porting */
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0) && 0
static inline int sigio_block(void)
{
OsBlockSIGIO();
Index: xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.1.1.3 Fri Jan 16 21:27:22 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c Tue Jan 1 00:34:53 2019
@@ -395,7 +395,11 @@ intel_crtc_apply(xf86CrtcPtr crtc)
}
if (scrn->pScreen)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(scrn->pScreen);
+#else
xf86_reload_cursors(scrn->pScreen);
+#endif
done:
free(output_ids);
@@ -2072,6 +2076,14 @@ intel_pageflip_abort(ScrnInfoPtr scrn, x
/*
* Check for pending DRM events and process them.
*/
+#if HAVE_NOTIFY_FD
+static void drmmode_notify_fd(int fd, int notify, void *data)
+{
+ struct intel_mode *mode;
+
+ drmHandleEvent(fd, &mode->event_context);
+}
+#else
static void
drm_wakeup_handler(pointer data, int err, pointer p)
{
@@ -2086,6 +2098,7 @@ drm_wakeup_handler(pointer data, int err
if (FD_ISSET(mode->fd, read_mask))
drmHandleEvent(mode->fd, &mode->event_context);
}
+#endif
/*
* If there are any available, read drm_events
@@ -2250,9 +2263,13 @@ intel_mode_init(struct intel_screen_priv
* registration within ScreenInit and not PreInit.
*/
mode->flip_count = 0;
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(mode->fd, drmmode_notify_fd, X_NOTIFY_READ, mode);
+#else
AddGeneralSocket(mode->fd);
RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
drm_wakeup_handler, mode);
+#endif
}
void
@@ -2276,9 +2293,13 @@ intel_mode_close(intel_screen_private *i
intel_drm_abort_scrn(intel->scrn);
+#if HAVE_NOTIFY_FD
+ RemoveNotifyFd(mode->fd);
+#else
RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
drm_wakeup_handler, mode);
RemoveGeneralSocket(mode->fd);
+#endif
}
void
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.8 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.9
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.8 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Tue Jan 1 00:34:53 2019
@@ -523,7 +523,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
crtc->gamma_blue, crtc->gamma_size);
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
return TRUE;
}
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c Tue Jan 1 00:34:53 2019
@@ -108,7 +108,7 @@ static XF86MCAdaptorRec adaptor_template
(xf86XvMCDestroySubpictureProcPtr)NULL
};
-XF86MCAdaptorPtr vlCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name)
+XF86MCAdaptorPtr vlCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name)
{
XF86MCAdaptorPtr adaptor;
ScrnInfoPtr pScrn;
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h:1.1.1.1 xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h:1.1.1.1 Tue Oct 13 01:33:26 2015
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h Tue Jan 1 00:34:53 2019
@@ -3,7 +3,7 @@
#include <xf86xvmc.h>
-XF86MCAdaptorPtr vlCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name);
+XF86MCAdaptorPtr vlCreateAdaptorXvMC(ScreenPtr pScreen, const char *xv_adaptor_name);
void vlDestroyAdaptorXvMC(XF86MCAdaptorPtr adaptor);
void vlInitXvMC(ScreenPtr pScreen, unsigned int num_adaptors, XF86MCAdaptorPtr *adaptors);
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.7 xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.8
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.7 Tue Aug 29 04:43:42 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c Tue Jan 1 00:34:53 2019
@@ -3846,7 +3846,11 @@ iga1_crtc_commit(xf86CrtcPtr crtc)
"Entering iga1_crtc_commit.\n"));
if (crtc->scrn->pScreen != NULL && pVia->drmmode.hwcursor)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
/* Turn on IGA1. */
viaIGA1DPMSControl(pScrn, 0x00);
@@ -4252,7 +4256,11 @@ iga2_crtc_commit(xf86CrtcPtr crtc)
"Entering iga2_crtc_commit.\n"));
if (crtc->scrn->pScreen != NULL && pVia->drmmode.hwcursor)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(crtc->scrn->pScreen);
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
+#endif
/* Turn on IGA2. */
viaIGA2DisplayOutput(pScrn, TRUE);
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c:1.1.1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c:1.1.1.2 Fri Aug 19 23:31:24 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c Tue Jan 1 00:34:53 2019
@@ -228,7 +228,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
#endif
if (pScrn->pScreen && drmmode->hwcursor)
+#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
+ xf86CursorResetCursor(pScrn->pScreen);
+#else
xf86_reload_cursors(pScrn->pScreen);
+#endif
done:
free(output_ids);
return (ret < 0 ? FALSE : TRUE);
Index: xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c
diff -u xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c:1.3 xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c:1.4
--- xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c:1.3 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c Tue Jan 1 00:34:53 2019
@@ -1010,7 +1010,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int fl
ClockRangePtr clockRanges;
Bool ddcLoaded = FALSE;
xf86MonPtr pMon = NULL;
- char *s;
+ const char *s;
Bool tmp_bool;
/* Allocate the TRIDENTRec driverPrivate */
Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c:1.2 xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c:1.3
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c:1.2 Tue Aug 16 08:07:50 2016
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c Tue Jan 1 00:34:53 2019
@@ -1331,8 +1331,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
&pVMWARE->xineramaNumOutputs, "gui");
pVMWARE->xineramaStatic = pVMWARE->xineramaState != NULL;
-
- free(topology);
}
} else if (useXinerama &&
xf86IsOptionSet(options, OPTION_STATIC_XINERAMA)) {
@@ -1344,8 +1342,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
"static Xinerama");
pVMWARE->xineramaStatic = pVMWARE->xineramaState != NULL;
-
- free(topology);
}
}
Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c:1.1.1.3 xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c:1.2
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c:1.1.1.3 Sat Jul 12 04:40:17 2014
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c Tue Jan 1 00:34:53 2019
@@ -83,7 +83,7 @@ vmwareAddDefaultMode(ScrnInfoPtr pScrn,
DisplayModeRec dynamic =
{ MODEPREFIX, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MODESUFFIX };
unsigned dispModeCount = 0;
- char **dispModeList;
+ const char **dispModeList;
char *dynModeName;
char name[80];
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
