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

Commit cc50bc5b authored by Jing Xiang's avatar Jing Xiang Committed by Tomi Valkeinen
Browse files

video: mmp: calculate pitch value when fb set win 



Add new func mmpfb_set_win to make code clean, it will do resolution
and fmt setting of win in mmpfb_set_win.

Signed-off-by: default avatarJing Xiang <jxiang@marvell.com>
Signed-off-by: default avatarJett.Zhou <jtzhou@marvell.com>
Signed-off-by: default avatarZhou Zhu <zzhu3@marvell.com>
Reviewed-by: default avatarDaniel Drake <dsd@laptop.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 1f2e42c6

drivers/video/mmp/fb/mmpfb.c

+16 −12
Original line number Diff line number Diff line
@@ -392,12 +392,23 @@ static int var_update(struct fb_info *info) 
	return 0;

}



static void mmpfb_set_win(struct fb_info *info)

{

	struct mmpfb_info *fbi = info->par;

	struct mmp_win win;



	memset(&win, 0, sizeof(win));

	win.xsrc = win.xdst = fbi->mode.xres;

	win.ysrc = win.ydst = fbi->mode.yres;

	win.pix_fmt = fbi->pix_fmt;

	mmp_overlay_set_win(fbi->overlay, &win);

}



static int mmpfb_set_par(struct fb_info *info)

{

	struct mmpfb_info *fbi = info->par;

	struct fb_var_screeninfo *var = &info->var;

	struct mmp_addr addr;

	struct mmp_win win;

	struct mmp_mode mode;

	int ret;
@@ -409,11 +420,8 @@ static int mmpfb_set_par(struct fb_info *info) 
	fbmode_to_mmpmode(&mode, &fbi->mode, fbi->output_fmt);

	mmp_path_set_mode(fbi->path, &mode);



	memset(&win, 0, sizeof(win));

	win.xsrc = win.xdst = fbi->mode.xres;

	win.ysrc = win.ydst = fbi->mode.yres;

	win.pix_fmt = fbi->pix_fmt;

	mmp_overlay_set_win(fbi->overlay, &win);

	/* set window related info */

	mmpfb_set_win(info);



	/* set address always */

	memset(&addr, 0, sizeof(addr));
@@ -427,16 +435,12 @@ static int mmpfb_set_par(struct fb_info *info) 
static void mmpfb_power(struct mmpfb_info *fbi, int power)

{

	struct mmp_addr addr;

	struct mmp_win win;

	struct fb_var_screeninfo *var = &fbi->fb_info->var;



	/* for power on, always set address/window again */

	if (power) {

		memset(&win, 0, sizeof(win));

		win.xsrc = win.xdst = fbi->mode.xres;

		win.ysrc = win.ydst = fbi->mode.yres;

		win.pix_fmt = fbi->pix_fmt;

		mmp_overlay_set_win(fbi->overlay, &win);

		/* set window related info */

		mmpfb_set_win(fbi->fb_info);



		/* set address always */

		memset(&addr, 0, sizeof(addr));