Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95cc44a0 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Tomi Valkeinen
Browse files

fbdev: vfb: add option for video mode 



Make vfb a bit more flexible in sense what it can represent and allow
the end user to specify video mode parameters via newly introduced module
option "mode". Since it is test module it is still up to the end user
to make sure there is enough memory to satisfy video mode settings.

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
[tomi.valkeinen@ti.com: constified vfb_default]
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent cf957ccc

drivers/video/fbdev/vfb.c

+21 −22
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ static u_long videomemorysize = VIDEOMEMSIZE; 
module_param(videomemorysize, ulong, 0);

MODULE_PARM_DESC(videomemorysize, "RAM available to frame buffer (in bytes)");



static char *mode_option = NULL;

module_param(mode_option, charp, 0);

MODULE_PARM_DESC(mode_option, "Preferred video mode (e.g. 640x480-8@60)");



/**********************************************************************

 *

 * Memory management
@@ -86,18 +90,9 @@ static void rvfree(void *mem, unsigned long size) 
	vfree(mem);

}



static struct fb_var_screeninfo vfb_default = {

static const struct fb_videomode vfb_default = {

	.xres =		640,

	.yres =		480,

	.xres_virtual =	640,

	.yres_virtual =	480,

	.bits_per_pixel = 8,

	.red =		{ 0, 8, 0 },

      	.green =	{ 0, 8, 0 },

      	.blue =		{ 0, 8, 0 },

      	.activate =	FB_ACTIVATE_TEST,

      	.height =	-1,

      	.width =	-1,

	.pixclock =	20000,

	.left_margin =	64,

	.right_margin =	64,
@@ -479,6 +474,8 @@ static int __init vfb_setup(char *options) 
		/* Test disable for backwards compatibility */

		if (!strcmp(this_opt, "disable"))

			vfb_enable = 0;

		else

			mode_option = this_opt;

	}

	return 1;

}
@@ -506,11 +503,13 @@ static int vfb_probe(struct platform_device *dev) 
	info->screen_base = (char __iomem *)videomemory;

	info->fbops = &vfb_ops;



	retval = fb_find_mode(&info->var, info, NULL,

			      NULL, 0, NULL, 8);

	if (!fb_find_mode(&info->var, info, mode_option,

			  NULL, 0, &vfb_default, 8)){

		fb_err(info, "Unable to find usable video mode.\n");

		retval = -EINVAL;

		goto err1;

	}



	if (!retval || (retval == 4))

		info->var = vfb_default;

	vfb_fix.smem_start = (unsigned long) videomemory;

	vfb_fix.smem_len = videomemorysize;

	info->fix = vfb_fix;