Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit mostly fix amd64 xorg-server 1.20 builds:
details: https://anonhg.NetBSD.org/xsrc/rev/0cb6482b8526
branches: trunk
changeset: 10062:0cb6482b8526
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Dec 31 22:17:20 2018 +0000
description:
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
diffstat:
external/mit/xf86-video-amdgpu/include/config.h | 2 ++
external/mit/xf86-video-ati-kms/include/config.h | 2 ++
external/mit/xf86-video-ati/dist/src/compat-api.h | 5 +++++
external/mit/xf86-video-ati/dist/src/drmmode_display.c | 4 ++++
external/mit/xf86-video-ati/dist/src/radeon_kms.c | 8 +++++++-
external/mit/xf86-video-ati/dist/src/radeon_probe.c | 1 +
external/mit/xf86-video-ati/include/config.h | 2 ++
external/mit/xf86-video-intel/dist/src/compat-api.h | 12 +++++-------
external/mit/xf86-video-intel/dist/src/sna/sna.h | 5 ++---
external/mit/xf86-video-intel/dist/src/sna/sna_accel.c | 9 ++++-----
external/mit/xf86-video-intel/dist/src/sna/sna_driver.c | 8 ++------
external/mit/xf86-video-mach64/dist/src/atipreinit.c | 7 -------
external/mit/xf86-video-nouveau/dist/src/drmmode_display.c | 6 +++---
external/mit/xf86-video-nouveau/dist/src/nv_driver.c | 12 ++++++++++++
external/mit/xf86-video-nouveau/dist/src/nv_proto.h | 7 +++++++
external/mit/xf86-video-nv/dist/src/compat-api.h | 2 +-
external/mit/xf86-video-openchrome/dist/src/via_driver.c | 8 +++++++-
external/mit/xf86-video-rendition/dist/src/rendition.c | 2 --
external/mit/xf86-video-s3virge/dist/src/s3v_driver.c | 12 ------------
external/mit/xf86-video-savage/dist/src/compat-api.h | 2 +-
external/mit/xf86-video-savage/dist/src/savage_driver.c | 2 --
external/mit/xf86-video-sis/dist/src/sis_driver.c | 2 +-
external/mit/xf86-video-suncg14/dist/src/cg14_driver.c | 8 +++++++-
external/mit/xf86-video-tdfx/dist/src/compat-api.h | 2 +-
external/mit/xf86-video-tga/dist/src/compat-api.h | 8 ++++++++
external/mit/xf86-video-tseng/dist/src/compat-api.h | 8 ++++++++
external/mit/xf86-video-tseng/dist/src/tseng_driver.c | 8 ++------
external/mit/xorg-server/include/dix-config.h | 4 +++-
28 files changed, 97 insertions(+), 61 deletions(-)
diffs (truncated from 626 to 300 lines):
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-amdgpu/include/config.h
--- a/external/mit/xf86-video-amdgpu/include/config.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-amdgpu/include/config.h Mon Dec 31 22:17:20 2018 +0000
@@ -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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati-kms/include/config.h
--- a/external/mit/xf86-video-ati-kms/include/config.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati-kms/include/config.h Mon Dec 31 22:17:20 2018 +0000
@@ -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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati/dist/src/compat-api.h
--- a/external/mit/xf86-video-ati/dist/src/compat-api.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/compat-api.h Mon Dec 31 22:17:20 2018 +0000
@@ -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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati/dist/src/drmmode_display.c
--- a/external/mit/xf86-video-ati/dist/src/drmmode_display.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/drmmode_display.c Mon Dec 31 22:17:20 2018 +0000
@@ -1529,9 +1529,13 @@
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;
}
}
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati/dist/src/radeon_kms.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_kms.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_kms.c Mon Dec 31 22:17:20 2018 +0000
@@ -154,6 +154,12 @@
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 @@
if (info->r600_shadow_fb) {
pixmap = pScreen->GetScreenPixmap(pScreen);
- if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked,
radeonShadowWindow, 0, NULL))
return FALSE;
}
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati/dist/src/radeon_probe.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_probe.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_probe.c Mon Dec 31 22:17:20 2018 +0000
@@ -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)
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-ati/include/config.h
--- a/external/mit/xf86-video-ati/include/config.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-ati/include/config.h Mon Dec 31 22:17:20 2018 +0000
@@ -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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-intel/dist/src/compat-api.h
--- a/external/mit/xf86-video-intel/dist/src/compat-api.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-intel/dist/src/compat-api.h Mon Dec 31 22:17:20 2018 +0000
@@ -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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-intel/dist/src/sna/sna.h
--- a/external/mit/xf86-video-intel/dist/src/sna/sna.h Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-intel/dist/src/sna/sna.h Mon Dec 31 22:17:20 2018 +0000
@@ -1189,10 +1189,9 @@
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);
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
--- a/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Mon Dec 31 22:17:20 2018 +0000
@@ -17370,8 +17370,7 @@
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 @@
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 @@
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 @@
}
DamageRegister(&new_front->drawable, dirty->damage);
- dirty->src = new_front;
+ dirty->src = (DrawablePtr)new_front;
}
#endif
}
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-intel/dist/src/sna/sna_driver.c
--- a/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c Mon Dec 31 22:17:20 2018 +0000
@@ -766,17 +766,13 @@
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
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-mach64/dist/src/atipreinit.c
--- a/external/mit/xf86-video-mach64/dist/src/atipreinit.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-mach64/dist/src/atipreinit.c Mon Dec 31 22:17:20 2018 +0000
@@ -2281,8 +2281,6 @@
pitchInc = minPitch * pATI->bitsPerPixel;
- pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3;
-
if (pATI->Chip < ATI_CHIP_264VT)
{
/*
@@ -2292,13 +2290,8 @@
* 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)
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
--- a/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Mon Dec 31 13:02:41 2018 +0000
+++ b/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Mon Dec 31 22:17:20 2018 +0000
@@ -697,7 +697,7 @@
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_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 @@
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
udev_device_unref(dev);
}
-#endif
#if HAVE_NOTIFY_FD
static void
@@ -1558,6 +1557,7 @@
drmmode_handle_uevents(scrn);
}
#endif
+#endif
static bool has_randr(void)
{
diff -r 57ec467ffd38 -r 0cb6482b8526 external/mit/xf86-video-nouveau/dist/src/nv_driver.c
Home |
Main Index |
Thread Index |
Old Index