Re: [PATCH 5/6] From: Andrew Morton <akpm@osdl.org>

[Paul Mackerras <paulus@samba.org>]

Andrew Morton writes:

> I still get crap all over the screen when xmon is tring to print something
> (at least, I assume that's what causes it).  See
> http://userweb.kernel.org/~akpm/s5000334.jpg

That is because the nvidia console driver has changed the line pitch
from what the firmware set it to.  This should 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>
---
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index d4f8501..18b9101 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -28,6 +28,9 @@ #ifdef CONFIG_PPC_OF
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
+#ifdef CONFIG_BOOTX_TEXT
+#include <asm/btext.h>
+#endif
 
 #include "nv_local.h"
 #include "nv_type.h"
@@ -681,6 +684,13 @@ #endif
 
 	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;
 }