Commit:     306c869c237a66fe85580f60558f105e3305d465
Parent:     9cd1c67434544b1d9a4fb4a4cdec15608167a233
Author:     Adrian McMenamin <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 10 13:00:48 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Aug 11 15:47:40 2007 -0700

    pvr2fb: Consolidated cleanup of pvr2fb.c
    - better handling of the pvr2 registers based on more up to date 
    Testing shows that it seems to work pretty well at 16bpp, 24bpp and 32bpp -
    including proper rendering of the boot logo at all levels (previously this 
    a bit broken even at 16bpp) and giving white against black text.  Really
    detailed testing (eg with X11) requires support for the maple bus - which
    isn't (currently - next project assuming this is okay) available, but I have
    no reason to think this is broken.
    Signed-off by: Adrian McMenamin <[EMAIL PROTECTED]>
    Acked-by: Paul Mundt <[EMAIL PROTECTED]>
    Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/video/pvr2fb.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index a72921b..7d6c298 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -94,6 +94,7 @@
 #define DISP_DIWCONF (DISP_BASE + 0xe8)
 #define DISP_DIWHSTRT (DISP_BASE + 0xec)
 #define DISP_DIWVSTRT (DISP_BASE + 0xf0)
+#define DISP_PIXDEPTH (DISP_BASE + 0x108)
 /* Pixel clocks, one for TV output, doubled for VGA output */
 #define TV_CLK 74239
@@ -600,6 +601,7 @@ static void pvr2_init_display(struct fb_info *info)
        /* bits per pixel */
        fb_writel(fb_readl(DISP_DIWMODE) | (--bytesperpixel << 2), 
+       fb_writel(bytesperpixel << 2, DISP_PIXDEPTH);
        /* video enable, color sync, interlace,
         * hsync and vsync polarity (currently unused) */
@@ -808,6 +810,8 @@ static int __devinit pvr2fb_common_init(void)
        if (register_framebuffer(fb_info) < 0)
                goto out_err;
+       /*Must write PIXDEPTH to register before anything is displayed - so 
force init */
+       pvr2_init_display(fb_info);
        modememused = get_line_length(fb_info->var.xres_virtual,
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to