Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f18b4f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: Take the mutex before calling msm_gem_new_impl"

parents 081fe064 4870006a

drivers/gpu/drm/msm/msm_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/msm_gpu.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}