Merge branch 'late/board' into devel-late

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nv50_instmem.c

diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index a7c12c94a5a62f1b7f03336659a293b67a0d5b80..0bba54f118002231e101281ed59dcd8d75880eb2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -83,7 +83,7 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
                return ret;
        }
 
-       ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size);
+       ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size - 0x6000);
        if (ret) {
                nv50_channel_del(&chan);
                return ret;