---

yaml --- r: 38079 b: refs/heads/master c: 70abac6 h: refs/heads/master i: 38077: c3a1086 38075: 8cd9cef 38071: b35bad5 38063: 5999a51 38047: 2b42231 38015: c46ec45 v: v3
git-mirror · Oct 3, 2006 · e5482c7 · e5482c7
1 parent e9956fa
commit e5482c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a09fd48f8fb6ecb8bf85efdd884b21b6201ef9cc
+refs/heads/master: 70abac6e4f4bfb05a8198e22225f9e066239c7a2
diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/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;
 }