The patch titled
nvidia fbdev: fix powerpc xmon scribbles
has been added to the -mm tree. Its filename is
nvidia-fbdev-fix-powerpc-xmon-scribbles.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: nvidia fbdev: fix powerpc xmon scribbles
From: Paul Mackerras <paulus@xxxxxxxxx>
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@xxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/nvidia/nvidia.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff -puN drivers/video/nvidia/nvidia.c~nvidia-fbdev-fix-powerpc-xmon-scribbles drivers/video/nvidia/nvidia.c
--- a/drivers/video/nvidia/nvidia.c~nvidia-fbdev-fix-powerpc-xmon-scribbles
+++ a/drivers/video/nvidia/nvidia.c
@@ -28,6 +28,9 @@
#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 @@ static int nvidiafb_set_par(struct fb_in
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;
}
_
Patches currently in -mm which might be from paulus@xxxxxxxxx are
origin.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
git-powerpc.patch
git-powerpc-wrapper-dont-require-execute-permissions.patch
powerpc-xmon-fix.patch
generic-bug-handling.patch
use-generic-bug-for-i386.patch
use-generic-bug-for-x86-64.patch
use-generic-bug-for-powerpc.patch
use-generic-bug-for-powerpc-fix-2.patch
bug-test-1.patch
restore-parport_pc-probing-on-powermac.patch
add-missing-page_copy-export-for-ppc-and-powerpc.patch
nvidia-fbdev-fix-powerpc-xmon-scribbles.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
