Skip to content

Commit

Permalink
video: s3c-fb: move enabling channel for window
Browse files Browse the repository at this point in the history
This patch moves enabling channel for window, because there should
be enabling channel before enabling window. If the sequence is
reversed, it makes the problem in displaying images to lcd panel.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Jingoo Han authored and Paul Mundt committed Jun 9, 2011
1 parent 13e6af8 commit fab7c5b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/video/s3c-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,13 @@ static int s3c_fb_set_par(struct fb_info *info)
vidosd_set_alpha(win, alpha);
vidosd_set_size(win, data);

/* Enable DMA channel for this window */
if (sfb->variant.has_shadowcon) {
data = readl(sfb->regs + SHADOWCON);
data |= SHADOWCON_CHx_ENABLE(win_no);
writel(data, sfb->regs + SHADOWCON);
}

data = WINCONx_ENWIN;

/* note, since we have to round up the bits-per-pixel, we end up
Expand Down Expand Up @@ -636,13 +643,6 @@ static int s3c_fb_set_par(struct fb_info *info)
writel(data, regs + sfb->variant.wincon + (win_no * 4));
writel(0x0, regs + sfb->variant.winmap + (win_no * 4));

/* Enable DMA channel for this window */
if (sfb->variant.has_shadowcon) {
data = readl(sfb->regs + SHADOWCON);
data |= SHADOWCON_CHx_ENABLE(win_no);
writel(data, sfb->regs + SHADOWCON);
}

shadow_protect_win(win, 0);

return 0;
Expand Down

0 comments on commit fab7c5b

Please sign in to comment.