From 1a5125cc8b09dfa576cd222e6facc9c5a2c3dc1d Mon Sep 17 00:00:00 2001 From: pengcheng chen Date: Tue, 12 Dec 2017 13:46:20 +0800 Subject: [PATCH] osd: fix cursor support with 32bit app[1/2] PD#156057: osd: fix cursor support with 32bit app Change-Id: I69f4c94ea16efca4e130af665e0fc7e4b05c5312 Signed-off-by: pengcheng chen --- drivers/amlogic/media/osd/osd.h | 5 ++++- drivers/amlogic/media/osd/osd_fb.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/media/osd/osd.h b/drivers/amlogic/media/osd/osd.h index d4c3107ec4e6..64d4765689ff 100644 --- a/drivers/amlogic/media/osd/osd.h +++ b/drivers/amlogic/media/osd/osd.h @@ -94,7 +94,10 @@ enum color_index_e { #define FBIOPUT_OSD_ROTATE_ANGLE 0x4517 #define FBIOPUT_OSD_SYNC_ADD 0x4518 #define FBIOPUT_OSD_SYNC_RENDER_ADD 0x4519 -#define FBIOPUT_OSD_CURSOR 0x451a + +#define FB_IOC_MAGIC 'O' +#define FBIOPUT_OSD_CURSOR \ + _IOWR(FB_IOC_MAGIC, 0x0, struct fb_cursor_user) /* OSD color definition */ #define KEYCOLOR_FLAG_TARGET 1 #define KEYCOLOR_FLAG_ONHOLD 2 diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c index 1f81dfd9e626..36b871e1b09a 100644 --- a/drivers/amlogic/media/osd/osd_fb.c +++ b/drivers/amlogic/media/osd/osd_fb.c @@ -1020,9 +1020,8 @@ static int osd_compat_ioctl(struct fb_info *info, unsigned long ret; arg = (unsigned long)compat_ptr(arg); - /* handle fbio cursor command for 32-bit app */ - if ((cmd & 0xFFFF) == (FBIO_CURSOR & 0xFFFF)) + if ((cmd & 0xFFFF) == (FBIOPUT_OSD_CURSOR & 0xFFFF)) ret = osd_compat_cursor(info, arg); else ret = osd_ioctl(info, cmd, arg);