Marcin Slusarz
2011-Dec-02 19:39 UTC
[Nouveau] [PATCH] drm/nv50: fix ramin heap size for kernel channel too
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 at gmail.com>
Cc: Younes Manton <younes.m at gmail.com>
---
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
Marcin Slusarz
2011-Dec-22 16:55 UTC
[Nouveau] [PATCH] drm/nv50: fix ramin heap size for kernel channel too
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 <marcin.slusarz at gmail.com> > Cc: Younes Manton <younes.m at gmail.com> > --- > 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