Hi,
Erik-Jan schrieb:
Julian Wollrath wrote:
> Hi,
>
> since I switched from 2.6.31.8 to 2.6.32.2 loading the viafb module
> turns the screen to black, there is no graphic output on the screen
anymore.
I had the same sort of problem with CLE266. Only I didn't get a black
screen, but a scrambled-up screen, as if the timings were wrong.
Well not exactly the same (initially) as the former one was mainly a new
supported chip started without the correct parameters.
Not surprisingly, it all has to do with the 2D engine rewrite (around
commit c3e25673843153ea75fda79a47cf12f10a25ca37) that has been done in
2.6.32.
I found a few small things in the initialization of the framebuffer,
that were present in 2.6.31 but removed in 2.6.32.
Attached a patch that puts these changes back in. I don't know if I've
done some bad things (never done any kernel coding before) nor if it is
OK for all the different VIA hardware out there, but on my CLE266 it now
works as before.
Excellent work!
The changes to accel.c are needed for a correct boot; the other changes
are needed for changing the framebuffer mode with fbset.
Ooh, I really must have been blind to let the later one slip in. But I
prefer a bit different solution as in 0001-*.patch to not duplicate that
call (and using info instead of viafbinfo as this is more compatible on
the way to dual head support). For the first one, well, I do not own
every VIA hardware especially not all configurations and for the oldest
ones there isn't even documentation available so I have sometimes rely
on people testing (ideally -mm so that bugs are caught before they go
mainline).
The attached patches apply to current -mm
http://userweb.kernel.org/~akpm/mmotm/
If you are okay with them please give them your sign-off as you are the
original author so that I can forward them to Andrew.
Thanks a lot,
Florian Tobias Schandinat
>From a4d146a3b73da61d026308bef7effc47b71b433b Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Date: Sun, 3 Jan 2010 00:25:15 +0000
Subject: [PATCH 1/2] viafb: do modesetting after updating variables
viafb: do modesetting after updating variables
Reorder viafb_set_par to allow using the updated variables in
viafb_setmode. This fixes a regression that prevented proper
runtime mode changes.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
---
drivers/video/via/viafbdev.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index e16df84..f7ff4ea 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -174,15 +174,15 @@ static int viafb_set_par(struct fb_info *info)
}
if (vmode_entry) {
- viafb_setmode(vmode_entry, info->var.bits_per_pixel,
- vmode_entry1, viafb_bpp1);
-
viafb_update_fix(info);
viafb_bpp = info->var.bits_per_pixel;
if (info->var.accel_flags & FB_ACCELF_TEXT)
info->flags &= ~FBINFO_HWACCEL_DISABLED;
else
info->flags |= FBINFO_HWACCEL_DISABLED;
+
+ viafb_setmode(vmode_entry, info->var.bits_per_pixel,
+ vmode_entry1, viafb_bpp1);
}
return 0;
--
1.6.3.2
>From 7ad1f2249e7d0d176f3a962d0bae27374f984822 Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Date: Mon, 4 Jan 2010 19:03:48 +0000
Subject: [PATCH 2/2] viafb: fix acceleration for some chips
viafb: fix acceleration for some chips
This patch fixes a regression in hardware acceleration which made the
accelerated framebuffer unusable on some chips. These need extra
initialization and an extra flag which is no longer needed/available
on current chips.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
---
drivers/video/via/accel.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index 9d4f3a4..d5077df 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -137,7 +137,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height,
tmp, dst_pitch);
return -EINVAL;
}
- tmp = (tmp >> 3) | (dst_pitch << (16 - 3));
+ tmp = VIA_PITCH_ENABLE | (tmp >> 3) | (dst_pitch << (16 - 3));
writel(tmp, engine + 0x38);
if (op == VIA_BITBLT_FILL)
@@ -352,6 +352,9 @@ int viafb_init_engine(struct fb_info *info)
viapar->shared->vq_vram_addr = viapar->fbmem_free;
viapar->fbmem_used += VQ_SIZE;
+ /* Init 2D engine reg to reset 2D engine */
+ writel(0x0, engine + VIA_REG_KEYCONTROL);
+
/* Init AGP and VQ regs */
switch (chip_name) {
case UNICHROME_K8M890:
--
1.6.3.2
