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

ODROID-COMMON: osd: support flexible length of fb size

Browse Source 
Change-Id: Iebdb7edf12f206696394a571575dac6879c9a591
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
This commit is contained in:
Joy Cho
2018-12-28 11:33:37 +09:00
committed by Dongjin Kim
parent 068e856d43
commit 0dfeba4136
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,22 @@ static int osd_cursor(struct fb_info *fbi, struct fb_cursor *var);
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor);
static int osd_set_fb_var(int index, const struct vinfo_s *vinfo)
{
if ((vinfo->width < 0) || (vinfo->height < 0)) {
pr_err("invalid vinfo\n");
return 1;
}
fb_def_var[index].xres = vinfo->width;
fb_def_var[index].yres = vinfo->height;
fb_def_var[index].xres_virtual = vinfo->width;
fb_def_var[index].yres_virtual = vinfo->height * 2;
fb_def_var[index].bits_per_pixel = 32;
return 0;
}
static void osd_set_fb_parameters(int index, const struct vinfo_s *vinfo)
{
osd_set_free_scale_enable_hw(index, 0);
@@ -397,7 +413,6 @@ static void osd_set_fb_parameters(int index, const struct vinfo_s *vinfo)
osd_set_free_scale_axis_hw(index, 0, 0, vinfo->width, vinfo->height);
osd_set_window_axis_hw(index, 0, 0, vinfo->width, vinfo->height);
osd_enable_hw(index, 1);
}
#endif /* CONFIG_ARCH_MESON64_ODROID_COMMON */
@@ -4369,6 +4384,32 @@ static int osd_probe(struct platform_device *pdev)
if (ret)
osd_log_info("not found display_size_default\n");
else {
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (osd_set_fb_var(index, vinfo)) {
/* no available vinfo, set default */
fb_def_var[index].xres =
var_screeninfo[0];
fb_def_var[index].yres =
var_screeninfo[1];
fb_def_var[index].xres_virtual =
var_screeninfo[2];
fb_def_var[index].yres_virtual =
var_screeninfo[3];
fb_def_var[index].bits_per_pixel =
var_screeninfo[4];
}
pr_info("fb def : %d %d %d %d %d\n",
fb_def_var[index].xres,
fb_def_var[index].yres,
fb_def_var[index].xres_virtual,
fb_def_var[index].yres_virtual,
fb_def_var[index].bits_per_pixel);
pr_info("init fbdev bpp is:%d\n",
fb_def_var[index].bits_per_pixel);
if (fb_def_var[index].bits_per_pixel > 32)
fb_def_var[index].bits_per_pixel = 32;
#else
fb_def_var[index].xres = var_screeninfo[0];
fb_def_var[index].yres = var_screeninfo[1];
fb_def_var[index].xres_virtual =
@@ -4381,6 +4422,7 @@ static int osd_probe(struct platform_device *pdev)
fb_def_var[index].bits_per_pixel);
if (fb_def_var[index].bits_per_pixel > 32)
fb_def_var[index].bits_per_pixel = 32;
#endif
}
}