]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nvidia fbdev: fix powerpc xmon scribbles
authorPaul Mackerras <paulus@samba.org>
Fri, 10 Nov 2006 23:28:30 +0000 (00:28 +0100)
committerAdrian Bunk <bunk@stusta.de>
Fri, 10 Nov 2006 23:28:30 +0000 (00:28 +0100)
xmon writes garbage on the screen because the nvidia console driver has
changed the line pitch from what the firmware set it to.  Fix it by making
the nvidia driver inform the btext engine (which xmon uses if the screen is
its output device) about changes to display resolution.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/video/nvidia/nvidia.c

index 3a307248cd71cd7330a3b782a2d30fbe02ee6362..28f0bebb0911b42859122eddfabb83d7a0e0093b 100644 (file)
@@ -31,6 +31,9 @@
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
 #endif
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
 #endif
+#ifdef CONFIG_BOOTX_TEXT
+#include <asm/btext.h>
+#endif
 
 #include "nv_local.h"
 #include "nv_type.h"
 
 #include "nv_local.h"
 #include "nv_type.h"
@@ -1107,6 +1110,13 @@ static int nvidiafb_set_par(struct fb_info *info)
 
        nvidia_vga_protect(par, 0);
 
 
        nvidia_vga_protect(par, 0);
 
+#ifdef CONFIG_BOOTX_TEXT
+       /* Update debug text engine */
+       btext_update_display(info->fix.smem_start,
+                            info->var.xres, info->var.yres,
+                            info->var.bits_per_pixel, info->fix.line_length);
+#endif
+
        NVTRACE_LEAVE();
        return 0;
 }
        NVTRACE_LEAVE();
        return 0;
 }