shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: fix cursor support with 32bit app[1/2]

Browse Source 
PD#156057: osd: fix cursor support with 32bit app

Change-Id: I69f4c94ea16efca4e130af665e0fc7e4b05c5312
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
This commit is contained in:
pengcheng chen
2017-12-12 13:46:20 +08:00
committed by Jianxin Pan
parent 61a614707e
commit 1a5125cc8b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/amlogic/media/osd/osd.h
View File

@@ -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

3
drivers/amlogic/media/osd/osd_fb.c
View File

@@ -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);