diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2012-04-15 08:36:07 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 02:31:52 -0400 |
commit | d37f60c87fbf9dca6724ed42fd55b031f88dd46a (patch) | |
tree | 2b6bb35f2a8e93f957503ec32103d72496dd3ae8 /drivers/gpu/drm/nouveau | |
parent | d8b6624549342e4b01a5fa8273029d9139439ae4 (diff) |
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@gmail.com>
Cc: Younes Manton <younes.m@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r-- | 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 a7c12c94a5a6..0bba54f11800 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, | |||
83 | return ret; | 83 | return ret; |
84 | } | 84 | } |
85 | 85 | ||
86 | ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size); | 86 | ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size - 0x6000); |
87 | if (ret) { | 87 | if (ret) { |
88 | nv50_channel_del(&chan); | 88 | nv50_channel_del(&chan); |
89 | return ret; | 89 | return ret; |