Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jing Xiang <jxiang@marvell.com>
Signed-off-by: Jett.Zhou <jtzhou@marvell.com>
Signed-off-by: Zhou Zhu <zzhu3@marvell.com>
Reviewed-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

authored by

Jing Xiang and committed by
Tomi Valkeinen
cc50bc5b 1f2e42c6

+16 -12
+16 -12
drivers/video/mmp/fb/mmpfb.c
··· 392 392 return 0; 393 393 } 394 394 395 + static void mmpfb_set_win(struct fb_info *info) 396 + { 397 + struct mmpfb_info *fbi = info->par; 398 + struct mmp_win win; 399 + 400 + memset(&win, 0, sizeof(win)); 401 + win.xsrc = win.xdst = fbi->mode.xres; 402 + win.ysrc = win.ydst = fbi->mode.yres; 403 + win.pix_fmt = fbi->pix_fmt; 404 + mmp_overlay_set_win(fbi->overlay, &win); 405 + } 406 + 395 407 static int mmpfb_set_par(struct fb_info *info) 396 408 { 397 409 struct mmpfb_info *fbi = info->par; 398 410 struct fb_var_screeninfo *var = &info->var; 399 411 struct mmp_addr addr; 400 - struct mmp_win win; 401 412 struct mmp_mode mode; 402 413 int ret; 403 414 ··· 420 409 fbmode_to_mmpmode(&mode, &fbi->mode, fbi->output_fmt); 421 410 mmp_path_set_mode(fbi->path, &mode); 422 411 423 - memset(&win, 0, sizeof(win)); 424 - win.xsrc = win.xdst = fbi->mode.xres; 425 - win.ysrc = win.ydst = fbi->mode.yres; 426 - win.pix_fmt = fbi->pix_fmt; 427 - mmp_overlay_set_win(fbi->overlay, &win); 412 + /* set window related info */ 413 + mmpfb_set_win(info); 428 414 429 415 /* set address always */ 430 416 memset(&addr, 0, sizeof(addr)); ··· 435 427 static void mmpfb_power(struct mmpfb_info *fbi, int power) 436 428 { 437 429 struct mmp_addr addr; 438 - struct mmp_win win; 439 430 struct fb_var_screeninfo *var = &fbi->fb_info->var; 440 431 441 432 /* for power on, always set address/window again */ 442 433 if (power) { 443 - memset(&win, 0, sizeof(win)); 444 - win.xsrc = win.xdst = fbi->mode.xres; 445 - win.ysrc = win.ydst = fbi->mode.yres; 446 - win.pix_fmt = fbi->pix_fmt; 447 - mmp_overlay_set_win(fbi->overlay, &win); 434 + /* set window related info */ 435 + mmpfb_set_win(fbi->fb_info); 448 436 449 437 /* set address always */ 450 438 memset(&addr, 0, sizeof(addr));