From d279a4d2c321cfdcdbafffe90e501ac0f7735a38 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 17 Jan 2011 11:22:38 +1000
Subject: [PATCH] --- yaml --- r: 231631 b: refs/heads/master c:
 f01a9720cb149e76155dc6e0e051058450305f4f h: refs/heads/master i:   231629:
 9e2cef46ce5a2e579a353a1de4ad50d7a4d031da   231627:
 11d58245ee48425678b94b633b7a9364a7d09e38   231623:
 ae2b01e80a260732811ee3c61c6dcce3a03dec25   231615:
 5e0b01ff7e88e72ad30963d349a1c85567e394a3 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3352a2cafecc..bd8d6f5ea0f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b464bfed674fc25d39d8a686010ebe509c8f62a
+refs/heads/master: f01a9720cb149e76155dc6e0e051058450305f4f
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 326eeda6ad7f..f988362c112e 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -352,8 +352,8 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
 			      FBINFO_HWACCEL_IMAGEBLIT;
 	info->flags |= FBINFO_CAN_FORCE_OUTPUT;
 	info->fbops = &nouveau_fbcon_sw_ops;
-	info->fix.smem_start = dev->mode_config.fb_base +
-			       (nvbo->bo.mem.start << PAGE_SHIFT);
+	info->fix.smem_start = nvbo->bo.mem.bus.base +
+			       nvbo->bo.mem.bus.offset;
 	info->fix.smem_len = size;
 
 	info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo);