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>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 77ffded68837..d2712e6e5d31 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);