diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-27 02:00:25 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-08 04:48:10 +0100 |
| commit | a11c3198c9ba38d81e25b65e3908d531feba1372 (patch) | |
| tree | 89f9489d91af56cf9a4a376ef5310989dd54bebb /drivers/gpu/drm/nouveau/nouveau_object.c | |
| parent | drm/nv50: implement custom vram mm (diff) | |
| download | linux-a11c3198c9ba38d81e25b65e3908d531feba1372.tar.xz linux-a11c3198c9ba38d81e25b65e3908d531feba1372.zip | |
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 5cc3f7e59fa1..dd1859f7d8b0 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, } ret = -ENOSYS; - if (dev_priv->ramin_available) + if (!(flags & NVOBJ_FLAG_DONT_MAP)) ret = instmem->map(gpuobj); if (ret) gpuobj->pinst = ~0; |