From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 20 Oct 2010 05:35:28 +0000 (+1000)
Subject: drm/nv50: fix evo instmem alignment
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8888cb18ffd1f32c51e61ca8d3d179c3c3946d1e;p=linux-beck.git

drm/nv50: fix evo instmem alignment

Not an issue right now, we're forced to 64k size/alignment by the BO
allocator anyway.  This won't be the case soon.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index d270f17a5310..887b2a97e2a2 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -234,7 +234,7 @@ nv50_evo_create(struct drm_device *dev)
 	 * use this also as there's no per-channel support on the
 	 * hardware
 	 */
-	ret = nouveau_gpuobj_new(dev, NULL, 32768, 0x1000,
+	ret = nouveau_gpuobj_new(dev, NULL, 32768, 65536,
 				 NVOBJ_FLAG_ZERO_ALLOC, &evo->ramin);
 	if (ret) {
 		NV_ERROR(dev, "Error allocating EVO channel memory: %d\n", ret);