lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/vmwgfx: Fix up an error path during bo creation

Browse Source 
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Thomas Hellstrom
2010-11-17 13:24:48 +01:00
committed by Dave Airlie
parent a5193fe50e
commit 2f5993cca6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
View File

@@ -862,7 +862,7 @@ int vmw_dmabuf_alloc_ioctl(struct drm_device *dev, void *data,
&vmw_vram_sys_placement, true, &vmw_vram_sys_placement, true,
&vmw_user_dmabuf_destroy); &vmw_user_dmabuf_destroy);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
return ret; goto out_no_dmabuf;
tmp = ttm_bo_reference(&vmw_user_bo->dma.base); tmp = ttm_bo_reference(&vmw_user_bo->dma.base);
ret = ttm_base_object_init(vmw_fpriv(file_priv)->tfile, ret = ttm_base_object_init(vmw_fpriv(file_priv)->tfile,
@@ -870,19 +870,21 @@ int vmw_dmabuf_alloc_ioctl(struct drm_device *dev, void *data,
false, false,
ttm_buffer_type, ttm_buffer_type,
&vmw_user_dmabuf_release, NULL); &vmw_user_dmabuf_release, NULL);
if (unlikely(ret != 0)) { if (unlikely(ret != 0))
ttm_bo_unref(&tmp); goto out_no_base_object;
} else { else {
rep->handle = vmw_user_bo->base.hash.key; rep->handle = vmw_user_bo->base.hash.key;
rep->map_handle = vmw_user_bo->dma.base.addr_space_offset; rep->map_handle = vmw_user_bo->dma.base.addr_space_offset;
rep->cur_gmr_id = vmw_user_bo->base.hash.key; rep->cur_gmr_id = vmw_user_bo->base.hash.key;
rep->cur_gmr_offset = 0; rep->cur_gmr_offset = 0;
} }
ttm_bo_unref(&tmp);
out_no_base_object:
ttm_bo_unref(&tmp);
out_no_dmabuf:
ttm_read_unlock(&vmaster->lock); ttm_read_unlock(&vmaster->lock);
return 0; return ret;
} }
int vmw_dmabuf_unref_ioctl(struct drm_device *dev, void *data, int vmw_dmabuf_unref_ioctl(struct drm_device *dev, void *data,