diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-04-30 13:48:11 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-04-30 13:48:51 -0400 |
| commit | 5d6b50041ec7bf02b718da80cb6416260f53ecf8 (patch) | |
| tree | 3a0a6488616798683b88b46813053db1bd8e7a5d | |
| parent | 1727d268841139661619681fcef2ac36cf1b0978 (diff) | |
kms/fb: fix again, now for load_cursor_argb_check
Last minute tweaks of how the new ABI shall be handled on xserver side.
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | src/drmmode_display.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 5e9913a..b032f5f 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -424,7 +424,7 @@ convert_cursor(CARD32 *dst, CARD32 *src, int dw, int sw) } static Bool -load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) +drmmode_load_cursor_argb_check(xf86CrtcPtr crtc, CARD32 *image) { drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; struct fd_bo *cursor = drmmode_crtc->cursor; @@ -442,19 +442,11 @@ load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) return ret == 0; } -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) -static Bool -drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) -{ - return load_cursor_argb(crtc, image); -} -#else static void drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) { - load_cursor_argb(crtc, image); + drmmode_load_cursor_argb_check(crtc, image); } -#endif static void drmmode_hide_cursor (xf86CrtcPtr crtc) @@ -584,6 +576,9 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = { .set_cursor_position = drmmode_set_cursor_position, .show_cursor = drmmode_show_cursor, .hide_cursor = drmmode_hide_cursor, +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) + .load_cursor_argb_check = drmmode_load_cursor_argb_check, +#endif .load_cursor_argb = drmmode_load_cursor_argb, .shadow_create = drmmode_crtc_shadow_create, .shadow_allocate = drmmode_crtc_shadow_allocate, |