diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-26 20:00:25 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-07 22:48:10 -0500 |
| commit | a11c3198c9ba38d81e25b65e3908d531feba1372 (patch) | |
| tree | 89f9489d91af56cf9a4a376ef5310989dd54bebb /drivers/gpu/drm/nouveau/nouveau_object.c | |
| parent | 573a2a37e8648a3249426c816f51e7ef50f6f73e (diff) | |
drm/nv50: import new vm code
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 5cc3f7e59fa..dd1859f7d8b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c | |||
| @@ -213,7 +213,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan, | |||
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | ret = -ENOSYS; | 215 | ret = -ENOSYS; |
| 216 | if (dev_priv->ramin_available) | 216 | if (!(flags & NVOBJ_FLAG_DONT_MAP)) |
| 217 | ret = instmem->map(gpuobj); | 217 | ret = instmem->map(gpuobj); |
| 218 | if (ret) | 218 | if (ret) |
| 219 | gpuobj->pinst = ~0; | 219 | gpuobj->pinst = ~0; |