diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:47 -0700 |
| commit | c2f18b4fd0441c6367a153efe1d24e9df3274934 (patch) | |
| tree | 9d1b95f94764f7f857d9d03e815989bb027b028f | |
| parent | 081fe06477e8ace1bed29fddd125d3c2ac272181 (diff) | |
| parent | 4870006adc5c4cd07787967de7902bdd3265acb5 (diff) | |
Merge "drm/msm: Take the mutex before calling msm_gem_new_impl"
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 63128d11767e..d1455fbc980e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -750,7 +750,10 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, size = PAGE_ALIGN(size); + mutex_lock(&dev->struct_mutex); ret = msm_gem_new_impl(dev, size, MSM_BO_WC, &obj); + mutex_unlock(&dev->struct_mutex); + if (ret) goto fail; diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3176f301e7a8..14c0cfc58270 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -576,8 +576,7 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) if (submit->bos[i].flags & MSM_SUBMIT_BO_READ) msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->fence); - - if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE) + else if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE) msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->fence); } |