| commit | a11c3198c9ba38d81e25b65e3908d531feba1372 | [log] [tgz] |
|---|---|---|
| author | Ben Skeggs <bskeggs@redhat.com> | Fri Aug 27 10:00:25 2010 +1000 |
| committer | Ben Skeggs <bskeggs@redhat.com> | Wed Dec 08 13:48:10 2010 +1000 |
| tree | 89f9489d91af56cf9a4a376ef5310989dd54bebb | |
| parent | 573a2a37e8648a3249426c816f51e7ef50f6f73e [diff] [blame] |
drm/nv50: import new vm code Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 5cc3f7e..dd1859f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -213,7 +213,7 @@ } ret = -ENOSYS; - if (dev_priv->ramin_available) + if (!(flags & NVOBJ_FLAG_DONT_MAP)) ret = instmem->map(gpuobj); if (ret) gpuobj->pinst = ~0;