diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2016-12-04 21:55:10 +0100 |
|---|---|---|
| committer | Russell King <rmk@armlinux.org.uk> | 2017-02-04 12:26:05 +0000 |
| commit | aeebab552b58d7ab100d99bab9c44811361bd6cb (patch) | |
| tree | 89b54515e09fd854a0ffa35365f954086c672c49 | |
| parent | 8ba65118e447f179da2317a72d656370f8a1e90d (diff) | |
armada: Adapt to video API 23
Block and wakeup handlers lose their pReadmask arguments.
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Russell King <rmk@armlinux.org.uk>
| -rw-r--r-- | common/compat-api.h | 8 | ||||
| -rw-r--r-- | common/unaccel_render.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/common/compat-api.h b/common/compat-api.h index 993daa0..f41e57b 100644 --- a/common/compat-api.h +++ b/common/compat-api.h @@ -98,4 +98,12 @@ #endif +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23,0) +#undef BLOCKHANDLER_ARGS_DECL +#undef BLOCKHANDLER_ARGS + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, void *pTimeout +#define BLOCKHANDLER_ARGS arg, pTimeout +#endif + #endif diff --git a/common/unaccel_render.c b/common/unaccel_render.c index 7617a21..ae2d7b2 100644 --- a/common/unaccel_render.c +++ b/common/unaccel_render.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#include "xf86.h" + #include "fb.h" #include "fbpict.h" #include "mipict.h" |