Skip to content

Commit

Permalink
fbdev: sh_mobile_lcdc: Fix line pitch computation
Browse files Browse the repository at this point in the history
Line pitch depends on the virtual horizontal resolution, compute it
accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  • Loading branch information
Laurent Pinchart committed Jul 19, 2012
1 parent 0c75c4e commit 16ca21c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/video/sh_mobile_lcdcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,9 +1580,9 @@ static int sh_mobile_lcdc_overlay_set_par(struct fb_info *info)
ovl->yres_virtual = info->var.yres_virtual;

if (ovl->format->yuv)
ovl->pitch = info->var.xres;
ovl->pitch = info->var.xres_virtual;
else
ovl->pitch = info->var.xres * ovl->format->bpp / 8;
ovl->pitch = info->var.xres_virtual * ovl->format->bpp / 8;

sh_mobile_lcdc_overlay_setup(ovl);

Expand Down Expand Up @@ -2024,9 +2024,9 @@ static int sh_mobile_lcdc_set_par(struct fb_info *info)
ch->yres_virtual = info->var.yres_virtual;

if (ch->format->yuv)
ch->pitch = info->var.xres;
ch->pitch = info->var.xres_virtual;
else
ch->pitch = info->var.xres * ch->format->bpp / 8;
ch->pitch = info->var.xres_virtual * ch->format->bpp / 8;

ret = sh_mobile_lcdc_start(ch->lcdc);
if (ret < 0)
Expand Down Expand Up @@ -2539,9 +2539,9 @@ sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_priv *priv,
ovl->yres_virtual = ovl->yres * 2;

if (!format->yuv)
ovl->pitch = ovl->xres * format->bpp / 8;
ovl->pitch = ovl->xres_virtual * format->bpp / 8;
else
ovl->pitch = ovl->xres;
ovl->pitch = ovl->xres_virtual;

/* Allocate frame buffer memory. */
ovl->fb_size = ovl->cfg->max_xres * ovl->cfg->max_yres
Expand Down Expand Up @@ -2628,10 +2628,10 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,

if (!format->yuv) {
ch->colorspace = V4L2_COLORSPACE_SRGB;
ch->pitch = ch->xres * format->bpp / 8;
ch->pitch = ch->xres_virtual * format->bpp / 8;
} else {
ch->colorspace = V4L2_COLORSPACE_REC709;
ch->pitch = ch->xres;
ch->pitch = ch->xres_virtual;
}

ch->display.width = cfg->panel_cfg.width;
Expand Down

0 comments on commit 16ca21c

Please sign in to comment.