summaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-10-03 01:15:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 08:04:13 -0700
commit70abac6e4f4bfb05a8198e22225f9e066239c7a2 (patch)
tree66caa9063402aab6309e2fe88e3e121828152a22 /drivers/video/nvidia
parenta09fd48f8fb6ecb8bf85efdd884b21b6201ef9cc (diff)
downloadop-kernel-dev-70abac6e4f4bfb05a8198e22225f9e066239c7a2.zip
op-kernel-dev-70abac6e4f4bfb05a8198e22225f9e066239c7a2.tar.gz
[PATCH] nvidia fbdev: fix powerpc xmon scribbles
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> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r--drivers/video/nvidia/nvidia.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 731edf7..eb24107 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/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_info *info)
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;
}
OpenPOWER on IntegriCloud