diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-04-30 18:13:37 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-04-30 18:15:27 -0400 |
| commit | 39630fd632470f789bf82af860701d7ff809fa7d (patch) | |
| tree | 758c803979a1816fd0e47ed4414ceff278ae0467 | |
| parent | 5d6b50041ec7bf02b718da80cb6416260f53ecf8 (diff) | |
fb: fix yet again, now for load_cursor_argb_check
Now actually fix it for fbmode too.
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | src/fbmode_display.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/fbmode_display.c b/src/fbmode_display.c index b83e0ff..85ba942 100644 --- a/src/fbmode_display.c +++ b/src/fbmode_display.c @@ -316,7 +316,7 @@ MSMCrtcHideCursor(xf86CrtcPtr crtc) } static Bool -load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image) +MSMCrtcLoadCursorARGBCheck(xf86CrtcPtr crtc, CARD32 * image) { #ifdef MSMFB_CURSOR fbmode_ptr fbmode = crtc->driver_private; @@ -343,19 +343,11 @@ load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image) #endif } -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) -static Bool -MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image) -{ - return load_cursor_argb(crtc, image); -} -#else static void MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image) { - load_cursor_argb(crtc, image); + MSMCrtcLoadCursorARGBCheck(crtc, image); } -#endif static const xf86CrtcFuncsRec MSMCrtcFuncs = { @@ -372,6 +364,9 @@ static const xf86CrtcFuncsRec MSMCrtcFuncs = { .set_cursor_position = MSMCrtcSetCursorPosition, .show_cursor = MSMCrtcShowCursor, .hide_cursor = MSMCrtcHideCursor, +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) + .load_cursor_argb_check = MSMCrtcLoadCursorARGBCheck, +#endif .load_cursor_argb = MSMCrtcLoadCursorARGB, .gamma_set = MSMCrtcGammaSet, .destroy = NULL, /* XXX */ |