From e7d3deee7c5eb116a1eee297bd5cf9c90d7959aa Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 20 Oct 2010 15:35:28 +1000 Subject: [PATCH] --- yaml --- r: 228549 b: refs/heads/master c: 8888cb18ffd1f32c51e61ca8d3d179c3c3946d1e h: refs/heads/master i: 228547: f295e990efcdc7285738df4e107664d221fd40a5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_evo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62bc1a280f3b..e20b40123a1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97e2000f757c19bb53e032320669f9a0d0b2a989 +refs/heads/master: 8888cb18ffd1f32c51e61ca8d3d179c3c3946d1e diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_evo.c b/trunk/drivers/gpu/drm/nouveau/nv50_evo.c index d270f17a5310..887b2a97e2a2 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_evo.c +++ b/trunk/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);