Module Name: xsrc
Committed By: mrg
Date: Mon Dec 31 13:02:41 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-geode/dist/src: gx_driver.c
xsrc/external/mit/xf86-video-intel/dist/src: compat-api.h
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_accel.c sna_acpi.c
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
nv_proto.h
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
various updates for xorg-server 1.20. some of these are work-in-progress,
the xsrc build is broken for most ports currently.
- xf86DisableRandR() is gone
- use HAVE_NOTIFY_FD like other modern drivers in compat-api.h
- pRotatedPixmap is done
- some PixmanPtr is now DrawablePtr (this one is all over problem with many
consumers, and perhaps the major breakage point currently.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
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_accel.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c
cvs rdiff -u -r1.6 -r1.7 \
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_proto.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
cvs rdiff -u -r1.31 -r1.32 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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-video-geode/dist/src/gx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.4 xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.5
--- xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.4 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c Mon Dec 31 13:02:41 2018
@@ -1428,7 +1428,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
/* Set up RandR */
+#if 0
xf86DisableRandR(); /* We provide our own RandR goodness */
+#endif
/* Try to set up the shadow FB for rotation */
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.1.1.3 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.1.1.3 Fri Jan 16 21:27:21 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h Mon Dec 31 13:02:41 2018
@@ -30,6 +30,11 @@
#include <xorg-server.h>
#include <xorgVersion.h>
+#include <xf86Module.h>
+
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0)
+#define HAVE_NOTIFY_FD 1
+#endif
#include <picturestr.h>
#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
@@ -55,8 +60,13 @@
#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
@@ -83,8 +93,13 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv
+#if HAVE_NOTIFY_FD
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout
+#define BLOCKHANDLER_ARGS arg, timeout
+#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
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.1.1.3 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.1.1.3 Fri Jan 16 21:27:23 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Mon Dec 31 13:02:41 2018
@@ -16754,7 +16754,6 @@ static int sna_create_gc(GCPtr gc)
gc->freeCompClip = 0;
gc->pCompositeClip = 0;
- gc->pRotatedPixmap = 0;
fb_gc(gc)->bpp = bits_per_pixel(gc->depth);
@@ -17371,7 +17370,8 @@ static void sna_accel_post_damage(struct
xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
RegionRec region, *damage;
- PixmapPtr src, dst;
+ DrawablePtr src;
+ PixmapPtr dst;
const BoxRec *box;
int16_t dx, dy;
int n;
@@ -17822,7 +17822,11 @@ bool sna_accel_init(ScreenPtr screen, st
list_init(&sna->flush_pixmaps);
list_init(&sna->active_pixmaps);
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(sna->kgem.fd, NULL, X_NOTIFY_NONE, NULL);
+#else
AddGeneralSocket(sna->kgem.fd);
+#endif
#ifdef DEBUG_MEMORY
sna->timer_expire[DEBUG_MEMORY_TIMER] = GetTimeInMillis()+ 10 * 1000;
@@ -17998,7 +18002,11 @@ void sna_accel_close(struct sna *sna)
sna_pixmap_expire(sna);
DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);
+#if HAVE_NOTIFY_FD
+ RemoveNotifyFd(sna->kgem.fd);
+#else
RemoveGeneralSocket(sna->kgem.fd);
+#endif
kgem_cleanup_cache(&sna->kgem);
}
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c:1.1.1.1 Wed Nov 5 17:56:22 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c Mon Dec 31 13:02:41 2018
@@ -92,7 +92,11 @@ void _sna_acpi_wakeup(struct sna *sna)
DBG(("%s: error [%d], detaching from acpid\n", __FUNCTION__, n));
/* XXX reattach later? */
+#if HAVE_NOTIFY_FD
+ RemoveNotifyFd(sna->acpi.fd);
+#else
RemoveGeneralSocket(sna->acpi.fd);
+#endif
sna_acpi_fini(sna);
return;
}
@@ -200,7 +204,11 @@ void sna_acpi_init(struct sna *sna)
DBG(("%s: attaching to acpid\n", __FUNCTION__));
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(sna->acpi.fd, NULL, X_NOTIFY_NONE, NULL);
+#else
AddGeneralSocket(sna->acpi.fd);
+#endif
sna->acpi.remain = sizeof(sna->acpi.event) - 1;
sna->acpi.offset = 0;
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.6 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.6 Tue Aug 29 04:43:42 2017
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Mon Dec 31 13:02:41 2018
@@ -34,6 +34,7 @@
#include "xorg-config.h"
#include "xorgVersion.h"
#include "Xdefs.h"
+#include "X11/Xdefs.h"
#include "nv_include.h"
#include "xf86drmMode.h"
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.1.1.3 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.1.1.3 Tue Aug 29 04:37:02 2017
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h Mon Dec 31 13:02:41 2018
@@ -1,6 +1,8 @@
#ifndef __NV_PROTO_H__
#define __NV_PROTO_H__
+#include <Xdefs.h>
+
/* in drmmode_display.c */
Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.10 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.11
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.10 Thu Jul 12 21:19:54 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Mon Dec 31 13:02:41 2018
@@ -2655,7 +2655,9 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
case 32: refreshArea = NVRefreshArea32; break;
}
if(!pNv->RandRRotation) {
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
}
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.2 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c Mon Dec 31 13:02:41 2018
@@ -1210,7 +1210,9 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
case 16: refreshArea = RivaRefreshArea16; break;
case 32: refreshArea = RivaRefreshArea32; break;
}
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
}
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.1.1.9 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.1.1.9 Sun Mar 5 01:39:59 2017
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Mon Dec 31 13:02:41 2018
@@ -1233,14 +1233,18 @@ static Bool SavagePreInit(ScrnInfoPtr pS
psav->shadowFB = TRUE;
psav->rotate = 1;
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen clockwise"
"- acceleration and RandR disabled\n");
} else if(!xf86NameCmp(s, "CCW")) {
psav->shadowFB = TRUE;
psav->rotate = -1;
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen counter clockwise"
" - acceleration and RandR disabled\n");
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.7 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.7 Sun Mar 5 01:42:55 2017
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Mon Dec 31 13:02:41 2018
@@ -8980,7 +8980,9 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
case 32: refreshArea = SISRefreshArea32; break;
}
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, disabling RandR\n");
#endif
@@ -8993,7 +8995,9 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
pScrn->PointerMoved = SISPointerMovedReflect;
refreshArea = SISRefreshAreaReflect;
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver reflection enabled, disabling RandR\n");
#endif
@@ -9105,7 +9109,9 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
pSiS->ShadowFB = FALSE;
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
if(pSiS->CRT1XOffs || pSiS->CRT1YOffs || pSiS->CRT2XOffs || pSiS->CRT2YOffs) {
+#if 0
xf86DisableRandR();
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"MergedFB: CRT2Position offset used, disabling RandR\n");
}
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.31 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.32
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.31 Mon Dec 31 12:01:31 2018
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Mon Dec 31 13:02:41 2018
@@ -1044,9 +1044,9 @@ WsfbScreenInit(SCREEN_INIT_ARGS_DECL)
"disabling DGA\n");
#endif
if (fPtr->rotate) {
-#if 0
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enabling Driver Rotation, "
"disabling RandR\n");
+#if 0
xf86DisableRandR();
#endif
if (pScrn->bitsPerPixel == 24)
