From e5482c7c11ed96604ffe71c2c00565519e5428c1 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 3 Oct 2006 01:15:14 -0700
Subject: [PATCH] --- yaml --- r: 38079 b: refs/heads/master c:
 70abac6e4f4bfb05a8198e22225f9e066239c7a2 h: refs/heads/master i:   38077:
 c3a1086bad0ceedae7cc1562f7de3adecd44b849   38075:
 8cd9ceff7ee66c879176d1ce171afbed389fc4d3   38071:
 b35bad50afda3558465a43f1ca6b668b1ea24888   38063:
 5999a518ef5cf64a3bab17e749d68642595d203b   38047:
 2b422313548164c4e5164f3852d33f39424d6864   38015:
 c46ec45b24450ec5ae0bd339167e670948522a67 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/video/nvidia/nvidia.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 198037671088..ab3bb16b42b3 100644
--- 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
index 731edf7cb0a0..eb24107bcc81 100644
--- 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;
 }