hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fbdev: sh_mobile_lcdc: use display information in info for panning 

We must not use any information in the passed var besides xoffset,
yoffset and vmode as otherwise applications might abuse it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
Laurent Pinchart 2011-08-31 13:00:55 +02:00 committed by Florian Tobias Schandinat
parent ed5bebf29e
commit dc1d5adab5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/sh_mobile_lcdcfb.c
View File

@ -877,12 +877,12 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
unsigned long base_addr_y, base_addr_c; unsigned long base_addr_y, base_addr_c;
unsigned long c_offset; unsigned long c_offset;
if (!var->nonstd) if (!info->var.nonstd)
new_pan_offset = (var->yoffset * info->fix.line_length) + new_pan_offset = var->yoffset * info->fix.line_length
(var->xoffset * (info->var.bits_per_pixel / 8)); + var->xoffset * (info->var.bits_per_pixel / 8);
else else
new_pan_offset = (var->yoffset * info->fix.line_length) + new_pan_offset = var->yoffset * info->fix.line_length
(var->xoffset); + var->xoffset;
if (new_pan_offset == ch->pan_offset) if (new_pan_offset == ch->pan_offset)
return 0; /* No change, do nothing */ return 0; /* No change, do nothing */
@ -891,13 +891,13 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
/* Set the source address for the next refresh */ /* Set the source address for the next refresh */
base_addr_y = ch->dma_handle + new_pan_offset; base_addr_y = ch->dma_handle + new_pan_offset;
if (var->nonstd) { if (info->var.nonstd) {
/* Set y offset */ /* Set y offset */
c_offset = (var->yoffset * c_offset = var->yoffset * info->fix.line_length
info->fix.line_length * * (info->var.bits_per_pixel - 8) / 8;
(info->var.bits_per_pixel - 8)) / 8; base_addr_c = ch->dma_handle
base_addr_c = ch->dma_handle + var->xres * var->yres_virtual + + info->var.xres * info->var.yres_virtual
c_offset; + c_offset;
/* Set x offset */ /* Set x offset */
if (info->var.bits_per_pixel == 24) if (info->var.bits_per_pixel == 24)
base_addr_c += 2 * var->xoffset; base_addr_c += 2 * var->xoffset;
@ -923,7 +923,7 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
ch->base_addr_c = base_addr_c; ch->base_addr_c = base_addr_c;
lcdc_write_chan_mirror(ch, LDSA1R, base_addr_y); lcdc_write_chan_mirror(ch, LDSA1R, base_addr_y);
if (var->nonstd) if (info->var.nonstd)
lcdc_write_chan_mirror(ch, LDSA2R, base_addr_c); lcdc_write_chan_mirror(ch, LDSA2R, base_addr_c);
if (lcdc_chan_is_sublcd(ch)) if (lcdc_chan_is_sublcd(ch))