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

ODROID-COMMON: fbcon: use soft cursor instead of hardware cursor

Browse Source 
The hardware cursor is not visible, so ....use soft cursor instead.

Change-Id: Ibb4e4b831940f0a4674adf27a6b6e5653a59d001
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
This commit is contained in:
Dongjin Kim
2019-02-19 18:05:50 +09:00
parent ad5225bace
commit 06e489b8ed
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/configs/odroidn2_spibios_defconfig
View File

@@ -829,7 +829,7 @@ CONFIG_AMLOGIC_VOUT2_SERVE=y
CONFIG_AMLOGIC_MEDIA_FB=y
CONFIG_AMLOGIC_MEDIA_FB_OSD_VSYNC_RDMA=y
CONFIG_AMLOGIC_MEDIA_FB_OSD2_ENABLE=y
CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR=y
# CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR is not set
#
# Amlogic OSD_EXT Module

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

@@ -380,9 +380,13 @@ struct ion_handle *fb_ion_handle[OSD_COUNT][OSD_MAX_BUF_NUM];
};
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR
static int osd_cursor(struct fb_info *fbi, struct fb_cursor *var);
#endif
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor);
static int overscan_ratio = 100; /* at % */
static int osd_set_fb_var(int index, const struct vinfo_s *vinfo)
@@ -1918,6 +1922,7 @@ static int osd_pan_display(struct fb_var_screeninfo *var,
return 0;
}
#ifdef CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR
static int osd_cursor(struct fb_info *fbi, struct fb_cursor *var)
{
s16 startx = 0, starty = 0;
@@ -1939,6 +1944,7 @@ static int osd_cursor(struct fb_info *fbi, struct fb_cursor *var)
return 0;
}
#endif
static int osd_sync(struct fb_info *info)
{
@@ -1956,10 +1962,17 @@ static struct fb_ops osd_ops = {
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
#ifdef CONFIG_FB_SOFT_CURSOR
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
&& !defined(CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR)
.fb_cursor = soft_cursor,
#else
#if defined(CONFIG_FB_SOFT_CURSOR)
.fb_cursor = soft_cursor,
#endif
#ifdef CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR
.fb_cursor = osd_cursor,
#endif
#endif
.fb_ioctl = osd_ioctl,
#ifdef CONFIG_COMPAT
.fb_compat_ioctl = osd_compat_ioctl,