On 19.07.2016 13:24, Keith Packard wrote: > Also deal with drm fd wakeup > > Block and wakeup handlers lose their pReadmask arguments > > Signed-off-by: Keith Packard <kei...@keithp.com> > --- > src/compat-api.h | 5 +++++ > src/drmmode_display.c | 22 +++++++++++++++++++++- > 2 files changed, 26 insertions(+), 1 deletion(-) > > diff --git a/src/compat-api.h b/src/compat-api.h > index b299f83..1039b0e 100644 > --- a/src/compat-api.h > +++ b/src/compat-api.h > @@ -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, void *pTimeout > +#define BLOCKHANDLER_ARGS arg, pTimeout > +#else > #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer > pReadmask > #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask > +#endif
Adam had already pushed a change dealing with the BlockHandler signature, so I pushed the rest of this change with the commit log adapted accordingly. Thanks! In the future, please send xf86-video-amdgpu/ati patches to the amd-...@lists.freedesktop.org mailing list for review before pushing them. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ 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