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

Commit a4b2e7bc 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/dsi-staging: take struct mutex before gem free"

parents 31c3aff3 bc0f5cb9

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -1193,7 +1193,9 @@ static int dsi_ctrl_buffer_deinit(struct dsi_ctrl *dsi_ctrl) 


		msm_gem_put_iova(dsi_ctrl->tx_cmd_buf, aspace);



		mutex_lock(&dsi_ctrl->drm_dev->struct_mutex);

		msm_gem_free_object(dsi_ctrl->tx_cmd_buf);

		mutex_unlock(&dsi_ctrl->drm_dev->struct_mutex);

		dsi_ctrl->tx_cmd_buf = NULL;

	}

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+2 −0
Original line number Diff line number Diff line
@@ -1708,7 +1708,9 @@ static ssize_t dsi_host_transfer(struct mipi_dsi_host *host, 
put_iova:

	msm_gem_put_iova(display->tx_cmd_buf, aspace);

free_gem:

	mutex_lock(&display->drm_dev->struct_mutex);

	msm_gem_free_object(display->tx_cmd_buf);

	mutex_unlock(&display->drm_dev->struct_mutex);

error:

	return rc;

}