Re: [PATCH xf86-video-savage] Changing result parameter type for ScreenWakeupHandlerProcPtr
On Thu, Jan 31, 2019 at 3:32 PM Kevin Brace wrote: > > For ABI_VIDEODRV_VERSION >= 23, it was changed to int from unsigned > long. > > Signed-off-by: Kevin Brace > --- > src/compat-api.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/compat-api.h b/src/compat-api.h > index 44daea4..7cf29d0 100644 > --- a/src/compat-api.h > +++ b/src/compat-api.h > @@ -82,7 +82,7 @@ A little more context would have made this a bit easier to review. The line immediately above this hunk is #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, unsigned long result > +#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result > #define WAKEUPHANDLER_ARGS arg, result Reviewed-by: Matt Turner (and for the identical -tdfx patch as well) ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-video-tdfx 2/2] Eliminate log message parameter type compilation warnings
Signed-off-by: Kevin Brace
---
src/tdfx_driver.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 14b931c..90bc56a 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -636,30 +636,30 @@ TDFXInitChips(ScrnInfoPtr pScrn)
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
"TDFXInitChips: numchips = %d\n", pTDFX->numChips);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: cfgbits = 0x%08lx, initbits = 0x%08lx\n",
+ "TDFXInitChips: cfgbits = 0x%08x, initbits = 0x%08x\n",
cfgbits, initbits);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0base = 0x%08lx, mem1base = 0x%08lx\n",
+ "TDFXInitChips: mem0base = 0x%08x, mem1base = 0x%08x\n",
mem0base, mem1base);
mem0size = 32 * 1024 * 1024; /* Registers are always 32MB */
mem1size = pScrn->videoRam * 1024 * 2; /* Linear mapping is 2x memory */
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0size = 0x%08lx, mem1size = 0x%08lx\n",
+ "TDFXInitChips: mem0size = 0x%08x, mem1size = 0x%08x\n",
mem0size, mem1size);
mem0bits = TDFXSizeToCfg(mem0size);
mem1bits = TDFXSizeToCfg(mem1size) << 4;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0bits = 0x%08lx, mem1bits = 0x%08lx\n",
+ "TDFXInitChips: mem0bits = 0x%08x, mem1bits = 0x%08x\n",
mem0bits, mem1bits);
cfgbits = (cfgbits & ~(0xFF)) | mem0bits | mem1bits;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: cfgbits = 0x%08lx\n", cfgbits);
+ "TDFXInitChips: cfgbits = 0x%08x\n", cfgbits);
for (i = 0; i < pTDFX->numChips; i++) {
PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
--
2.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-video-tdfx 1/2] Changing result parameter type for ScreenWakeupHandlerProcPtr
For ABI_VIDEODRV_VERSION >= 23, it was changed to int from unsigned long. Signed-off-by: Kevin Brace --- src/compat-api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compat-api.h b/src/compat-api.h index 44daea4..7cf29d0 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -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 -- 2.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-video-tdfx 0/2] Eliminating compilation warnings
2 more patches to completely eliminate compilation warnings. -- Kevin Brace (2): Changing result parameter type for ScreenWakeupHandlerProcPtr Eliminate log message parameter type compilation warnings src/compat-api.h | 2 +- src/tdfx_driver.c | 10 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-video-savage] Changing result parameter type for ScreenWakeupHandlerProcPtr
For ABI_VIDEODRV_VERSION >= 23, it was changed to int from unsigned long. Signed-off-by: Kevin Brace --- src/compat-api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compat-api.h b/src/compat-api.h index 44daea4..7cf29d0 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -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 -- 2.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: xf86EnableIO & ExtendedEnabled vs. the input thread
On Wed, 2019-01-23 at 14:22 -0800, Alan Coopersmith wrote: > I've confirmed with our kernel folks that the syscall we call from > xf86EnableIO() on Solaris has always only set the IOPL for the calling > thread and not other threads. They believe the primary difference between > Linux & Solaris is that when a new thread is spawned, it inherits the IOPL > on Linux, but on Solaris we reset the IOPL for the new thread instead of > inheriting it. Makes sense to me. > While we could update this in the kernel, that won't solve the problem for > people on older kernels, or one of the OpenSolaris off-shoots (and wearing > my security hat, I actually prefer the least-privilege method of not having > all new threads inherit the iopl from the main thread). Agreed. > But I have to ask if anyone remembers why we keep track of this flag in > userspace at all - it's not just Solaris, but it seems to have been > cargo-culted to most platforms: > > hw/xfree86/os-support/bsd/arm_video.c > hw/xfree86/os-support/bsd/i386_video.c > hw/xfree86/os-support/linux/lnx_video.c > hw/xfree86/os-support/solaris/sun_vid.c > > Is there any reason we just don't drop ExtendedEnabled altogether and > just always pass the calls through to the kernel? That'd leave us > still needing to call xf86EnableIO() in the input thread on Solaris, > unlike Linux, but that's more sensible than forcing a DisableIO() > first just to reset the ExtendedEnabled state. I can't think of a good reason to track ExtendedEnabled, no. All of the implementations look like they're idempotent (though I had to read the weird Linux ppc thing twice to be sure). The ExtendedEnabled logic itself seems to predate XFree86 4.0, which is back far enough in the dark ages that I don't think we'd ever find a useful changelog for its motivation. I say nuke it. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [xorgproto] Remove RCS Ids
Am 30.01.2019 21:35, schrieb Matthieu Herrb: > Signed-off-by: Matthieu Herrb > --- > include/X11/extensions/xcalibrateproto.h | 2 -- > include/X11/extensions/xcalibratewire.h | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/include/X11/extensions/xcalibrateproto.h > b/include/X11/extensions/xcalibrateproto.h > index cafdab2..f9b9425 100644 > --- a/include/X11/extensions/xcalibrateproto.h > +++ b/include/X11/extensions/xcalibrateproto.h > @@ -1,6 +1,4 @@ > /* > - * $Id: xcalibrateproto.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ > - * > * Copyright © 2003 Philip Blundell > * > * Permission to use, copy, modify, distribute, and sell this software and > its > diff --git a/include/X11/extensions/xcalibratewire.h > b/include/X11/extensions/xcalibratewire.h > index 0a1c904..d1d2edf 100644 > --- a/include/X11/extensions/xcalibratewire.h > +++ b/include/X11/extensions/xcalibratewire.h > @@ -1,6 +1,4 @@ > /* > - * $Id: xcalibratewire.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ > - * > * Copyright © 2003 Philip Blundell > * > * Permission to use, copy, modify, distribute, and sell this software and > its Reviewed-by: Walter Harms wharms@bfs,de ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
