drm/nv50: fix ramin heap size for kernel channel too
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Sun, 15 Apr 2012 12:36:07 +0000 (14:36 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 24 May 2012 06:31:52 +0000 (16:31 +1000)
Port change from "drm/nouveau: Keep RAMIN heap within the channel"
to kernel channel, which has its own ramin heap initialisation.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Younes Manton <younes.m@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_instmem.c

index a7c12c94a5a62f1b7f03336659a293b67a0d5b80..0bba54f118002231e101281ed59dcd8d75880eb2 100644 (file)
@@ -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;