Module Name: xsrc
Committed By: mrg
Date: Mon Dec 31 22:17:21 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h
xsrc/external/mit/xf86-video-ati-kms/include: config.h
xsrc/external/mit/xf86-video-ati/dist/src: compat-api.h
drmmode_display.c radeon_kms.c radeon_probe.c
xsrc/external/mit/xf86-video-ati/include: config.h
xsrc/external/mit/xf86-video-intel/dist/src: compat-api.h
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna.h sna_accel.c
sna_driver.c
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
nv_driver.c nv_proto.h
xsrc/external/mit/xf86-video-nv/dist/src: compat-api.h
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.c
xsrc/external/mit/xf86-video-rendition/dist/src: rendition.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: compat-api.h
savage_driver.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c
xsrc/external/mit/xf86-video-tdfx/dist/src: compat-api.h
xsrc/external/mit/xf86-video-tga/dist/src: compat-api.h
xsrc/external/mit/xf86-video-tseng/dist/src: compat-api.h
tseng_driver.c
xsrc/external/mit/xorg-server/include: dix-config.h
Log Message:
mostly fix amd64 xorg-server 1.20 builds:
- avoid bswap_16 etc defines for now. ends up with code-in-decl
- more ABI_VERSION 23 fixes (BlockHandler/WakeHandler) including re-fix
from previous
- more Notify API
- more shadowUpdatePackedWeak() removal
- remove fd_set handling from intel driver (part of ABI_VERSION 23)
- cope better with PixMap/Drawable separation in new server
- remove support for maxHValue and maxVValue (XXX?)
- hide drmmode_udev_notify() when not building udev
- comment out nouveau 'wfb' support, xorg-server 1.20 only supplies
either 'wfb' or 'fb' interface, not both, and we choose 'fb'
- define 'pointer' in nv_proto.h rather than relying upon Xdefs.h
- normalise the value of _XTYPEDEF_POINTER
- EGL is broken (missing) in xsrc currently
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-amdgpu/include/config.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-ati-kms/include/config.h
cvs rdiff -u -r1.2 -r1.3 \
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 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xf86-video-ati/include/config.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c
cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/xorg-server/include/dix-config.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/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.6 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.7
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.6 Sat Dec 29 08:49:52 2018
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h Mon Dec 31 22:17:20 2018
@@ -131,6 +131,7 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
+#if 0
/* Define to 16-bit byteswap macro */
#define bswap_16 bswap16
@@ -139,3 +140,4 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
+#endif
Index: xsrc/external/mit/xf86-video-ati-kms/include/config.h
diff -u xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.7 xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.8
--- xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.7 Sun Dec 30 07:34:43 2018
+++ xsrc/external/mit/xf86-video-ati-kms/include/config.h Mon Dec 31 22:17:20 2018
@@ -129,6 +129,7 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
+#if 0
/* Define to 16-bit byteswap macro */
#define bswap_16 bswap16
@@ -137,3 +138,4 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
+#endif
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.2 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.2 Sun Mar 5 03:18:38 2017
+++ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h Mon Dec 31 22:17:20 2018
@@ -73,8 +73,13 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
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.2 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.2 Wed Aug 17 00:06:59 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c Mon Dec 31 22:17:20 2018
@@ -1529,9 +1529,13 @@ void drmmode_init(ScrnInfoPtr pScrn, drm
if (pRADEONEnt->fd_wakeup_registered != serverGeneration &&
info->dri->pKernelDRMVersion->version_minor >= 4) {
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(drmmode->fd, drmmode_notify_fd, X_NOTIFY_READ, drmmode);
+#else
AddGeneralSocket(drmmode->fd);
RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
drm_wakeup_handler, drmmode);
+#endif
pRADEONEnt->fd_wakeup_registered = serverGeneration;
}
}
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.2 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.2 Tue Aug 16 01:27:46 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c Mon Dec 31 22:17:20 2018
@@ -154,6 +154,12 @@ radeonShadowWindow(ScreenPtr screen, CAR
return ((uint8_t *)info->front_bo->ptr + row * stride + offset);
}
+static void
+radeonUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
@@ -174,7 +180,7 @@ static Bool RADEONCreateScreenResources_
if (info->r600_shadow_fb) {
pixmap = pScreen->GetScreenPixmap(pScreen);
- if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked,
radeonShadowWindow, 0, NULL))
return FALSE;
}
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c:1.2 xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c:1.3
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c:1.2 Wed Aug 17 00:06:59 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c Mon Dec 31 22:17:20 2018
@@ -62,6 +62,7 @@
#include "radeon_chipinfo_gen.h"
#ifdef XSERVER_LIBPCIACCESS
+#include "xf86Pci.h"
#include "radeon_pci_device_match_gen.h"
static Bool radeon_ums_supported(ScrnInfoPtr pScrn, struct pci_device *pci_dev)
Index: xsrc/external/mit/xf86-video-ati/include/config.h
diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.15 xsrc/external/mit/xf86-video-ati/include/config.h:1.16
--- xsrc/external/mit/xf86-video-ati/include/config.h:1.15 Tue Aug 16 07:38:15 2016
+++ xsrc/external/mit/xf86-video-ati/include/config.h Mon Dec 31 22:17:20 2018
@@ -141,6 +141,7 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
+#if 0
/* Define to 16-bit byteswap macro */
#define bswap_16 bswap16
@@ -149,3 +150,4 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
+#endif
Index: xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.2 xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.2 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h Mon Dec 31 22:17:20 2018
@@ -60,13 +60,8 @@
#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer timeout, pointer read_mask
#define BLOCKHANDLER_ARGS arg, blockData, timeout, read_mask
-#if HAVE_NOTIFY_FD
-#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result
-#define WAKEUPHANDLER_ARGS arg, wakeupData, result
-#else
#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask
-#endif
#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr screen
#define CLOSE_SCREEN_ARGS scrnIndex, screen
@@ -93,16 +88,19 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv
-#if HAVE_NOTIFY_FD
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout
#define BLOCKHANDLER_ARGS arg, timeout
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
+#define WAKEUPHANDLER_ARGS arg, result
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout, pointer read_mask
#define BLOCKHANDLER_ARGS arg, timeout, read_mask
-#endif
#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr screen
#define CLOSE_SCREEN_ARGS screen
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.1.1.3 Fri Jan 16 21:27:23 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h Mon Dec 31 22:17:20 2018
@@ -1189,10 +1189,9 @@ char *sna_cpu_features_to_string(unsigne
int sna_acpi_open(void);
void sna_acpi_init(struct sna *sna);
void _sna_acpi_wakeup(struct sna *sna);
-static inline void sna_acpi_wakeup(struct sna *sna, void *read_mask)
+static inline void sna_acpi_wakeup(struct sna *sna)
{
- if (sna->acpi.fd >= 0 && FD_ISSET(sna->acpi.fd, (fd_set*)read_mask))
- _sna_acpi_wakeup(sna);
+ _sna_acpi_wakeup(sna);
}
void sna_acpi_fini(struct sna *sna);
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.1.1.3 Fri Jan 16 21:27:24 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c Mon Dec 31 22:17:20 2018
@@ -766,17 +766,13 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DE
if ((int)result < 0)
return;
- sna_acpi_wakeup(sna, read_mask);
+ sna_acpi_wakeup(sna);
sna->WakeupHandler(WAKEUPHANDLER_ARGS);
sna_accel_wakeup_handler(sna);
- if (FD_ISSET(sna->kgem.fd, (fd_set*)read_mask)) {
- sna_mode_wakeup(sna);
- /* Clear the flag so that subsequent ZaphodHeads don't block */
- FD_CLR(sna->kgem.fd, (fd_set*)read_mask);
- }
+ sna_mode_wakeup(sna);
}
#if HAVE_UDEV
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.2 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Mon Dec 31 22:17:20 2018
@@ -17370,8 +17370,7 @@ static void sna_accel_post_damage(struct
xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
RegionRec region, *damage;
- DrawablePtr src;
- PixmapPtr dst;
+ PixmapPtr src, dst;
const BoxRec *box;
int16_t dx, dy;
int n;
@@ -17382,7 +17381,7 @@ static void sna_accel_post_damage(struct
if (RegionNil(damage))
continue;
- src = dirty->src;
+ src = (PixmapPtr)dirty->src;
dst = dirty->slave_dst->master_pixmap;
region.extents.x1 = dirty->x;
@@ -17629,7 +17628,7 @@ migrate_dirty_tracking(PixmapPtr old_fro
xorg_list_for_each_entry_safe(dirty, safe, &screen->pixmap_dirty_list, ent) {
assert(dirty->src == old_front);
- if (dirty->src != old_front)
+ if ((PixmapPtr)dirty->src != old_front)
continue;
DamageUnregister(&dirty->src->drawable, dirty->damage);
@@ -17645,7 +17644,7 @@ migrate_dirty_tracking(PixmapPtr old_fro
}
DamageRegister(&new_front->drawable, dirty->damage);
- dirty->src = new_front;
+ dirty->src = (DrawablePtr)new_front;
}
#endif
}
Index: xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.7 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.8
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.7 Fri Aug 19 19:15:27 2016
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c Mon Dec 31 22:17:20 2018
@@ -2281,8 +2281,6 @@ ATIPreInit
pitchInc = minPitch * pATI->bitsPerPixel;
- pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3;
-
if (pATI->Chip < ATI_CHIP_264VT)
{
/*
@@ -2292,13 +2290,8 @@ ATIPreInit
* the bit is ignored.
*/
ATIClockRange.doubleScanAllowed = FALSE;
-
- /* CRTC_H_TOTAL is one bit narrower */
- pScreenInfo->maxHValue >>= 1;
}
- pScreenInfo->maxVValue = MaxBits(CRTC_V_TOTAL) + 1;
-
maxPitch = minPitch * MaxBits(CRTC_PITCH);
if (pATI->OptionAccel)
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.7 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.7 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Mon Dec 31 22:17:20 2018
@@ -697,7 +697,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
int c, total_width = 0, max_height = 0, this_x = 0;
if (!ppix) {
if (crtc->randr_crtc->scanout_pixmap) {
- PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
+ PixmapStopDirtyTracking((DrawablePtr)crtc->randr_crtc->scanout_pixmap, screenpix);
if (drmmode && drmmode->fb_id) {
drmModeRmFB(drmmode->fd, drmmode->fb_id);
drmmode->fb_id = 0;
@@ -744,7 +744,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
}
drmmode_crtc->scanout_pixmap_x = this_x;
#ifdef HAS_DIRTYTRACKING_ROTATION
- PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+ PixmapStartDirtyTracking((DrawablePtr)ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
#elif defined(HAS_DIRTYTRACKING2)
PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
#else
@@ -1548,7 +1548,6 @@ drmmode_handle_uevents(ScrnInfoPtr scrn)
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
udev_device_unref(dev);
}
-#endif
#if HAVE_NOTIFY_FD
static void
@@ -1558,6 +1557,7 @@ drmmode_udev_notify(int fd, int notify,
drmmode_handle_uevents(scrn);
}
#endif
+#endif
static bool has_randr(void)
{
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.1.1.3 xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.1.1.3 Tue Aug 29 04:37:02 2017
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c Mon Dec 31 22:17:20 2018
@@ -1074,9 +1074,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
}
if (pNv->AccelMethod > NONE) {
+#if 0
if (pNv->Architecture >= NV_TESLA)
pNv->wfb_enabled = xf86ReturnOptValBool(
pNv->Options, OPTION_WFB, FALSE);
+#endif
pNv->tiled_scanout = TRUE;
}
@@ -1235,10 +1237,12 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Set display resolution */
xf86SetDpi(pScrn, 0, 0);
+#if 0
if (pNv->wfb_enabled) {
if (xf86LoadSubModule(pScrn, "wfb") == NULL)
NVPreInitFail("\n");
}
+#endif
if (xf86LoadSubModule(pScrn, "fb") == NULL)
NVPreInitFail("\n");
@@ -1365,7 +1369,9 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
"Falling back to NoAccel\n");
pNv->AccelMethod = NONE;
pNv->ShadowFB = TRUE;
+#if 0
pNv->wfb_enabled = FALSE;
+#endif
pNv->tiled_scanout = FALSE;
pScrn->displayWidth = nv_pitch_align(pNv,
pScrn->virtualX,
@@ -1439,6 +1445,7 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
switch (pScrn->bitsPerPixel) {
case 16:
case 32:
+#if 0
if (pNv->wfb_enabled) {
ret = wfbScreenInit(pScreen, FBStart, pScrn->virtualX,
pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
@@ -1446,10 +1453,13 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
nouveau_wfb_setup_wrap,
nouveau_wfb_finish_wrap);
} else {
+#endif
ret = fbScreenInit(pScreen, FBStart, pScrn->virtualX,
pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
displayWidth, pScrn->bitsPerPixel);
+#if 0
}
+#endif
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1474,9 +1484,11 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
}
}
+#if 0
if (pNv->wfb_enabled)
wfbPictureInit (pScreen, 0, 0);
else
+#endif
fbPictureInit (pScreen, 0, 0);
xf86SetBlackWhitePixels(pScreen);
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h:1.2 xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h:1.3
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h:1.2 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h Mon Dec 31 22:17:20 2018
@@ -1,6 +1,13 @@
#ifndef __NV_PROTO_H__
#define __NV_PROTO_H__
+/* not defined in Xdefs.h for xorg-server 1.20. */
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+typedef void * pointer;
+#undef _XTYPEDEF_POINTER
+#define _XTYPEDEF_POINTER
+#endif
+
#include <Xdefs.h>
/* in drmmode_display.c */
Index: xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h:1.1.1.2 xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h:1.1.1.2 Sun Mar 5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h Mon Dec 31 22:17:20 2018
@@ -82,7 +82,7 @@
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
#define BLOCKHANDLER_ARGS arg, pTimeout
-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
#define WAKEUPHANDLER_ARGS arg, result
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.5 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.6
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.5 Tue Aug 29 04:43:42 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c Mon Dec 31 22:17:20 2018
@@ -1643,6 +1643,12 @@ viaShadowWindow(ScreenPtr pScreen, CARD3
return ((uint8_t *) drm_bo_map(pScrn, pVia->drmmode.front_bo) + row * stride + offset);
}
+static void
+viaUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool
VIACreateScreenResources(ScreenPtr pScreen)
{
@@ -1675,7 +1681,7 @@ VIACreateScreenResources(ScreenPtr pScre
return FALSE;
if (pVia->shadowFB) {
- if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, rootPixmap, viaUpdatePacked,
viaShadowWindow, 0, NULL))
return FALSE;
}
Index: xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c
diff -u xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c:1.3 xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c:1.4
--- xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c:1.3 Fri Aug 19 23:37:39 2016
+++ xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c Mon Dec 31 22:17:21 2018
@@ -813,8 +813,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo
* Validate the modes. Note that the limits passed to
* xf86ValidateModes() are VGA CRTC architectural limits.
*/
- pScreenInfo->maxHValue = MAX_HTOTAL;
- pScreenInfo->maxVValue = MAX_VTOTAL;
nModes = xf86ValidateModes(pScreenInfo,
pScreenInfo->monitor->Modes, pScreenInfo->display->modes,
&renditionClockRange, NULL, 8, MAX_HDISPLAY, Rounding,
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.6 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.7
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.6 Sat Aug 20 00:41:03 2016
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c Mon Dec 31 22:17:21 2018
@@ -1203,18 +1203,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
vga256InfoRec.directMode = XF86DGADirectPresent;
#endif
- /*
- * xf86ValidateModes will check that the mode HTotal and VTotal values
- * don't exceed the chipset's limit if pScrn->maxHValue and
- * pScrn->maxVValue are set.
- */
-
- /* todo - The virge limit is 2048 vertical & horizontal */
- /* pixels, not clock register settings. */
- /* true for all ViRGE? */
- pScrn->maxHValue = 2048;
- pScrn->maxVValue = 2048;
-
/* Lower depths default to config file */
pScrn->virtualX = pScrn->display->virtualX;
/* Adjust the virtualX to meet ViRGE hardware */
Index: xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h:1.1.1.2 xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h:1.1.1.2 Sun Mar 5 01:39:59 2017
+++ xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h Mon Dec 31 22:17:21 2018
@@ -82,7 +82,7 @@
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
#define BLOCKHANDLER_ARGS arg, pTimeout
-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
#define WAKEUPHANDLER_ARGS arg, result
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.2 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.3
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.2 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Mon Dec 31 22:17:21 2018
@@ -2038,8 +2038,6 @@ static Bool SavagePreInit(ScrnInfoPtr pS
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
mclk / 1000.0);
- pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */
- pScrn->maxVValue = 2048; /* 11 bits of v_total */
pScrn->virtualX = pScrn->display->virtualX;
pScrn->virtualY = pScrn->display->virtualY;
Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.8 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.9
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.8 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Mon Dec 31 22:17:21 2018
@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
float hsync, refresh = 0.0;
char *desc, *desc2, *prefix, *uprefix, *output;
- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d "
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
"(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
pScrn->displayWidth);
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.15 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.16
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.15 Tue Sep 27 19:11:51 2016
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c Mon Dec 31 22:17:21 2018
@@ -479,6 +479,12 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags
return TRUE;
}
+static void
+CG14UpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool
CG14CreateScreenResources(ScreenPtr pScreen)
{
@@ -496,7 +502,7 @@ CG14CreateScreenResources(ScreenPtr pScr
pPixmap = pScreen->GetScreenPixmap(pScreen);
- if (!shadowAdd(pScreen, pPixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, pPixmap, CG14UpdatePacked,
CG14WindowLinear, 0, NULL)) {
return FALSE;
}
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h:1.1.1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h:1.1.1.2 Sun Mar 5 01:40:12 2017
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h Mon Dec 31 22:17:21 2018
@@ -82,7 +82,7 @@
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
#define BLOCKHANDLER_ARGS arg, pTimeout
-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
#define WAKEUPHANDLER_ARGS arg, result
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
Index: xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h:1.1.1.1 xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h:1.1.1.1 Mon Jun 3 09:59:08 2013
+++ xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h Mon Dec 31 22:17:21 2018
@@ -78,11 +78,19 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
Index: xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h:1.1.1.1 xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h:1.1.1.1 Mon Jun 3 09:59:12 2013
+++ xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h Mon Dec 31 22:17:21 2018
@@ -78,11 +78,19 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
Index: xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c
diff -u xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c:1.2 xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c:1.3
--- xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c:1.2 Tue Aug 16 01:27:48 2016
+++ xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c Mon Dec 31 22:17:21 2018
@@ -1037,10 +1037,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
else
pTseng->Bytesperpixel = 1; /* this is fake for < 8bpp, but simplifies other code */
- /* hardware limits */
- pScrn->maxHValue = Tseng_HMAX;
- pScrn->maxVValue = Tseng_VMAX;
-
/*
* This must happen after pScrn->display has been set because
* xf86SetWeight references it.
@@ -1133,8 +1129,8 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
/* Select valid modes from those available */
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, &pTseng->clockRange,
- NULL, 32, pScrn->maxHValue, 8*pTseng->Bytesperpixel, /* H limits */
- 0, pScrn->maxVValue, /* V limits */
+ NULL, 32, /* XXXMRG pScrn->maxHValue*/ 2048, 8*pTseng->Bytesperpixel, /* H limits */
+ 0, /* XXXMRG pScrn->maxVValue*/ 2048, /* V limits */
pScrn->display->virtualX,
pScrn->display->virtualY,
pTseng->FbMapSize,
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.29 xsrc/external/mit/xorg-server/include/dix-config.h:1.30
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.29 Mon Dec 31 10:19:09 2018
+++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Dec 31 22:17:21 2018
@@ -467,7 +467,7 @@
#define SHMDIR "/var/shm"
/* Don't let Xdefs.h define 'pointer' */
-#define _XTYPEDEF_POINTER 1
+#define _XTYPEDEF_POINTER
/* Don't let XIproto define 'Pointer' */
#define _XITYPEDEF_POINTER 1
@@ -478,8 +478,10 @@
/* Build GLAMOR */
#define GLAMOR 1
+#if 0
/* Build glamor's GBM-based EGL support */
#define GLAMOR_HAS_GBM 1
+#endif
/* Build glamor/gbm has linear support */
#define GLAMOR_HAS_GBM_LINEAR 1
