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

Commit 3e0f7070 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/gem: move msm_gem cache flush api before copy" into msm-4.14

parents 6352885f 117cb25b

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

+1 −1
Original line number Diff line number Diff line
@@ -1079,10 +1079,10 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl, 


		cmdbuf = (u8 *)(dsi_ctrl->vaddr);



		msm_gem_sync(dsi_ctrl->tx_cmd_buf);

		for (cnt = 0; cnt < length; cnt++)

			cmdbuf[dsi_ctrl->cmd_len + cnt] = buffer[cnt];



		msm_gem_sync(dsi_ctrl->tx_cmd_buf);

		dsi_ctrl->cmd_len += length;



		if (!(msg->flags & MIPI_DSI_MSG_LASTCOMMAND)) {

drivers/gpu/drm/msm/sde/sde_hw_reg_dma_v1.c

+1 −1
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static int write_kick_off_v1(struct sde_reg_dma_kickoff_cfg *cfg) 
	struct sde_hw_blk_reg_map hw;



	memset(&hw, 0, sizeof(hw));

	msm_gem_sync(cfg->dma_buf->buf);

	cmd1 = (cfg->op == REG_DMA_READ) ?

		(dspp_read_sel[cfg->block_select] << 30) : 0;

	cmd1 |= (cfg->last_command) ? BIT(24) : 0;
@@ -526,7 +527,6 @@ static int write_kick_off_v1(struct sde_reg_dma_kickoff_cfg *cfg) 
	cmd1 |= (cfg->op == REG_DMA_WRITE) ? (BIT(22)) : 0;

	cmd1 |= (SIZE_DWORD(cfg->dma_buf->index) & MAX_DWORDS_SZ);



	msm_gem_sync(cfg->dma_buf->buf);

	SET_UP_REG_DMA_REG(hw, reg_dma);

	SDE_REG_WRITE(&hw, reg_dma_opmode_offset, BIT(0));

	val = SDE_REG_READ(&hw, reg_dma_intr_4_status_offset);