diff options
| author | Ben Skeggs | 2010-08-27 05:04:41 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2010-09-24 08:18:31 +0200 |
| commit | 9d59e8a1fc8fc35bf22dc92d7722a7502769ab7e (patch) | |
| tree | 404d4103b46bd4fcfef34541908cfd0af0db45bd /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | drm/nouveau: remove second map of notifier bo (diff) | |
| download | kernel-qcow2-linux-9d59e8a1fc8fc35bf22dc92d7722a7502769ab7e.tar.gz kernel-qcow2-linux-9d59e8a1fc8fc35bf22dc92d7722a7502769ab7e.tar.xz kernel-qcow2-linux-9d59e8a1fc8fc35bf22dc92d7722a7502769ab7e.zip | |
drm/nouveau: require explicit unmap of kmapped bos
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index ab661f459fe4..841c63f28867 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -58,8 +58,6 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) struct drm_device *dev = dev_priv->dev; struct nouveau_bo *nvbo = nouveau_bo(bo); - ttm_bo_kunmap(&nvbo->kmap); - if (unlikely(nvbo->gem)) DRM_ERROR("bo %p still attached to GEM object\n", bo); @@ -305,7 +303,8 @@ nouveau_bo_map(struct nouveau_bo *nvbo) void nouveau_bo_unmap(struct nouveau_bo *nvbo) { - ttm_bo_kunmap(&nvbo->kmap); + if (nvbo) + ttm_bo_kunmap(&nvbo->kmap); } u16 |