On Fri, Dec 02, 2011 at 08:39:19PM +0100, Marcin Slusarz wrote: > 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 <[email protected]> > Cc: Younes Manton <[email protected]> > --- > drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c > b/drivers/gpu/drm/nouveau/nv50_instmem.c > index a7c12c9..0bba54f 100644 > --- 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; > -- > 1.7.8.rc3 >
ping _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
