From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 5 Jul 2011 23:59:40 +0000 (+1000)
Subject: drm/nvd0/disp: they moved the linear flag..
X-Git-Tag: next-20111014~42^2~18^2~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fad3d5e2bc8776a2963399a936db13814107646;p=karo-tx-linux.git

drm/nvd0/disp: they moved the linear flag..

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index eb514ea29377..ddbabefb4273 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -105,9 +105,12 @@ nouveau_framebuffer_init(struct drm_device *dev,
 		if (dev_priv->chipset == 0x50)
 			nv_fb->r_format |= (tile_flags << 8);
 
-		if (!tile_flags)
-			nv_fb->r_pitch = 0x00100000 | fb->pitch;
-		else {
+		if (!tile_flags) {
+			if (dev_priv->card_type < NV_D0)
+				nv_fb->r_pitch = 0x00100000 | fb->pitch;
+			else
+				nv_fb->r_pitch = 0x01000000 | fb->pitch;
+		} else {
 			u32 mode = nvbo->tile_mode;
 			if (dev_priv->card_type >= NV_C0)
 				mode >>= 4;