diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-30 14:06:55 +1000 | 
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-17 10:10:07 +0200 | 
| commit | 32ecd24264542328893e8649312c301150dbadc5 (patch) | |
| tree | 04f631c2923566bac15537a0d2c89c1f63483dba /drivers/gpu/drm/udl/udl_gem.c | |
| parent | ec6f1bb90c9865d4a5af01b1c643bcf020d88706 (diff) | |
| download | olio-linux-3.10-32ecd24264542328893e8649312c301150dbadc5.tar.xz olio-linux-3.10-32ecd24264542328893e8649312c301150dbadc5.zip  | |
drm/udl: call begin/end cpu access at more appropriate time
We need to call these before we transfer the damaged areas to the device
not before/after we setup the long lived vmaps.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/udl/udl_gem.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 7 | 
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 291ecc14558..47b25637583 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -181,11 +181,6 @@ int udl_gem_vmap(struct udl_gem_object *obj)  	int ret;  	if (obj->base.import_attach) { -		ret = dma_buf_begin_cpu_access(obj->base.import_attach->dmabuf, -					       0, obj->base.size, DMA_BIDIRECTIONAL); -		if (ret) -			return -EINVAL; -  		obj->vmapping = dma_buf_vmap(obj->base.import_attach->dmabuf);  		if (!obj->vmapping)  			return -ENOMEM; @@ -206,8 +201,6 @@ void udl_gem_vunmap(struct udl_gem_object *obj)  {  	if (obj->base.import_attach) {  		dma_buf_vunmap(obj->base.import_attach->dmabuf, obj->vmapping); -		dma_buf_end_cpu_access(obj->base.import_attach->dmabuf, 0, -				       obj->base.size, DMA_BIDIRECTIONAL);  		return;  	}  |