From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed, 7 Aug 2013 15:11:27 +0000 (+0200)
Subject: drm/nouveau: require contiguous bo for framebuffer
X-Git-Tag: v3.12-rc2~3^2~7^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd9c5a2016307164c419c5e24a46921c10e620a0;p=kernel%2Fkernel-generic.git

drm/nouveau: require contiguous bo for framebuffer

This was already required before, but no check in the kernel was done
to enforce it.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
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 77ffded..d2712e6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -107,6 +107,11 @@ nouveau_framebuffer_init(struct drm_device *dev,
 			 return -EINVAL;
 		}
 
+		if (nvbo->tile_flags & NOUVEAU_GEM_TILE_NONCONTIG) {
+			NV_ERROR(drm, "framebuffer requires contiguous bo\n");
+			return -EINVAL;
+		}
+
 		if (nv_device(drm->device)->chipset == 0x50)
 			nv_fb->r_format |= (tile_flags << 8);