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

Commit fab7c5b7 authored by Jingoo Han's avatar Jingoo Han Committed by Paul Mundt
Browse files

video: s3c-fb: move enabling channel for window



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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 13e6af88
Loading
Loading
Loading
Loading
+7 −7
Original line number Original line Diff line number Diff line
@@ -557,6 +557,13 @@ static int s3c_fb_set_par(struct fb_info *info)
	vidosd_set_alpha(win, alpha);
	vidosd_set_alpha(win, alpha);
	vidosd_set_size(win, data);
	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;
	data = WINCONx_ENWIN;


	/* note, since we have to round up the bits-per-pixel, we end up
	/* note, since we have to round up the bits-per-pixel, we end 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(data, regs + sfb->variant.wincon + (win_no * 4));
	writel(0x0, regs + sfb->variant.winmap + (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);
	shadow_protect_win(win, 0);


	return 0;
	return 0;