lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: avoid unlocking mutex_lock twice

Browse Source 
Remove mutex unlock from msm_gem_get_iova_locked
as acquiring and releasing the lock are handled
in the caller function.

Change-Id: Ie4a8408d3e6308d19eb26aafee8dfe15bcb682da
Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
This commit is contained in:
Krishna Manikandan 2020-05-28 16:51:45 +05:30 committed by santosh
parent 74f3b5a9de
commit 9cb06f9b21
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
msm/msm_gem.c
View File

@ -449,7 +449,8 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj,
if (IS_ERR(obj->import_attach)) { if (IS_ERR(obj->import_attach)) {
DRM_ERROR("dma_buf_attach failure, err=%ld\n", DRM_ERROR("dma_buf_attach failure, err=%ld\n",
PTR_ERR(obj->import_attach)); PTR_ERR(obj->import_attach));
goto unlock; ret = PTR_ERR(obj->import_attach);
return ret;
} }
msm_obj->obj_dirty = false; msm_obj->obj_dirty = false;
reattach = true; reattach = true;
@ -462,14 +463,14 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj,
if (ret) { if (ret) {
DRM_ERROR("delayed dma-buf import failed %d\n", DRM_ERROR("delayed dma-buf import failed %d\n",
ret); ret);
goto unlock; return ret;
} }
} }
vma = add_vma(obj, aspace); vma = add_vma(obj, aspace);
if (IS_ERR(vma)) { if (IS_ERR(vma)) {
ret = PTR_ERR(vma); ret = PTR_ERR(vma);
goto unlock; return ret;
} }
pages = get_pages(obj); pages = get_pages(obj);
@ -493,13 +494,10 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj,
mutex_unlock(&aspace->list_lock); mutex_unlock(&aspace->list_lock);
} }
mutex_unlock(&msm_obj->lock);
return 0; return 0;
fail: fail:
del_vma(vma); del_vma(vma);
unlock:
mutex_unlock(&msm_obj->lock);
return ret; return ret;
} }
static int msm_gem_pin_iova(struct drm_gem_object *obj, static int msm_gem_pin_iova(struct drm_gem_object *obj,