From 359e4a025bc0e7ee6d10c8a871f8a7820f0404b2 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Mon, 6 Sep 2010 20:25:28 +0200 Subject: [PATCH] --- yaml --- r: 218189 b: refs/heads/master c: 35fd5b42f035c795bd9c6649591f59b500cb62b3 h: refs/heads/master i: 218187: 5acd0432fc01d25a36226b2b718efc6b189947e2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_instmem.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef8d5d88bce9..f7938e417e04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de5899bdaccaabfaab894559a7eec3302ae88b52 +refs/heads/master: 35fd5b42f035c795bd9c6649591f59b500cb62b3 diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c b/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c index 88316100389b..0b5ae297abde 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c +++ b/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c @@ -25,6 +25,9 @@ int nv04_instmem_init(struct drm_device *dev) u32 offset, length; int ret; + /* RAMIN always available */ + dev_priv->ramin_available = true; + /* Setup shared RAMHT */ ret = nouveau_gpuobj_new_fake(dev, 0x10000, ~0, 4096, NVOBJ_FLAG_ZERO_ALLOC, &ramht); @@ -81,7 +84,6 @@ int nv04_instmem_init(struct drm_device *dev) return ret; } - dev_priv->ramin_available = true; return 0; }