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

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

Merge "mdss: dsi: pass controller device to DMA APIs"

parents d7b26be2 f2a3ff07

drivers/video/msm/mdss/mdss_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1579,7 +1579,7 @@ int dsi_panel_device_register(struct device_node *pan_node, 
	if (ctrl_pdata->bklt_ctrl == BL_PWM)

		mdss_dsi_panel_pwm_cfg(ctrl_pdata);



	mdss_dsi_ctrl_init(ctrl_pdata);

	mdss_dsi_ctrl_init(&ctrl_pdev->dev, ctrl_pdata);

	/*

	 * register in mdp driver

	 */

drivers/video/msm/mdss/mdss_dsi.h

+2 −1
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ void mdss_dsi_cmd_test_pattern(struct mdss_dsi_ctrl_pdata *ctrl); 
void mdss_dsi_video_test_pattern(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_panel_pwm_cfg(struct mdss_dsi_ctrl_pdata *ctrl);



void mdss_dsi_ctrl_init(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_ctrl_init(struct device *ctrl_dev,

			struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_cmd_mdp_busy(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_wait4video_done(struct mdss_dsi_ctrl_pdata *ctrl);

int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp);

drivers/video/msm/mdss/mdss_dsi_cmd.c

+3 −4
Original line number Diff line number Diff line
@@ -69,15 +69,14 @@ char *mdss_dsi_buf_init(struct dsi_buf *dp) 
	return dp->data;

}



int mdss_dsi_buf_alloc(struct dsi_buf *dp, int size)

int mdss_dsi_buf_alloc(struct device *ctrl_dev, struct dsi_buf *dp, int size)

{



	dp->start = dma_alloc_writecombine(NULL, size, &dp->dmap, GFP_KERNEL);

	dp->start = dma_alloc_writecombine(ctrl_dev, size, &dp->dmap,

					   GFP_KERNEL);

	if (dp->start == NULL) {

		pr_err("%s:%u\n", __func__, __LINE__);

		return -ENOMEM;

	}



	dp->end = dp->start + size;

	dp->size = size;

drivers/video/msm/mdss/mdss_dsi_cmd.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -121,7 +121,7 @@ char *mdss_dsi_buf_unreserve(struct dsi_buf *dp, int len); 
char *mdss_dsi_buf_push(struct dsi_buf *dp, int len);

char *mdss_dsi_buf_reserve_hdr(struct dsi_buf *dp, int hlen);

char *mdss_dsi_buf_init(struct dsi_buf *dp);

int mdss_dsi_buf_alloc(struct dsi_buf *dp, int size);

int mdss_dsi_buf_alloc(struct device *ctrl_dev, struct dsi_buf *dp, int size);

int mdss_dsi_cmd_dma_add(struct dsi_buf *dp, struct dsi_cmd_desc *cm);

int mdss_dsi_short_read1_resp(struct dsi_buf *rp);

int mdss_dsi_short_read2_resp(struct dsi_buf *rp);

drivers/video/msm/mdss/mdss_dsi_host.c

+4 −3
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ static struct mdss_dsi_event dsi_event; 


static int dsi_event_thread(void *data);



void mdss_dsi_ctrl_init(struct mdss_dsi_ctrl_pdata *ctrl)

void mdss_dsi_ctrl_init(struct device *ctrl_dev,

			struct mdss_dsi_ctrl_pdata *ctrl)

{

	if (ctrl->panel_data.panel_info.pdest == DISPLAY_1) {

		mdss_dsi0_hw.ptr = (void *)(ctrl);
@@ -97,8 +98,8 @@ void mdss_dsi_ctrl_init(struct mdss_dsi_ctrl_pdata *ctrl) 
	spin_lock_init(&ctrl->mdp_lock);

	mutex_init(&ctrl->mutex);

	mutex_init(&ctrl->cmd_mutex);

	mdss_dsi_buf_alloc(&ctrl->tx_buf, SZ_4K);

	mdss_dsi_buf_alloc(&ctrl->rx_buf, SZ_4K);

	mdss_dsi_buf_alloc(ctrl_dev, &ctrl->tx_buf, SZ_4K);

	mdss_dsi_buf_alloc(ctrl_dev, &ctrl->rx_buf, SZ_4K);

	ctrl->cmdlist_commit = mdss_dsi_cmdlist_commit;