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

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

Merge "msm: mdss: Cleanup CMD_CLK_CTRL flag"

parents 9fc1b9ef ef729840

drivers/video/msm/mdss/dsi_host_v2.c

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

/* Copyright (c) 2012-2017, 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
@@ -1328,7 +1328,7 @@ static int msm_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl) 
	memset(&cmdreq, 0, sizeof(cmdreq));

	cmdreq.cmds = ctrl->status_cmds.cmds;

	cmdreq.cmds_cnt = ctrl->status_cmds.cmd_cnt;

	cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL | CMD_REQ_RX;

	cmdreq.flags = CMD_REQ_COMMIT | CMD_REQ_RX;

	cmdreq.rlen = 1;

	cmdreq.cb = NULL;

	cmdreq.rbuf = ctrl->status_buf.data;

drivers/video/msm/mdss/mdss_dsi_cmd.h

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

/* Copyright (c) 2012-2017, 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
@@ -98,7 +98,6 @@ struct dsi_cmd_desc { 
#define CMD_REQ_MAX     4

#define CMD_REQ_RX      0x0001

#define CMD_REQ_COMMIT  0x0002

#define CMD_CLK_CTRL    0x0004

#define CMD_REQ_UNICAST 0x0008

#define CMD_REQ_DMA_TPG 0x0040

#define CMD_REQ_NO_MAX_PKT_SIZE 0x0008

drivers/video/msm/mdss/mdss_dsi_host.c

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

/* Copyright (c) 2012-2017, 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
@@ -1108,7 +1108,7 @@ static int mdss_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl) 
		memset(&cmdreq, 0, sizeof(cmdreq));

		cmdreq.cmds = ctrl->status_cmds.cmds + i;

		cmdreq.cmds_cnt = 1;

		cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL | CMD_REQ_RX;

		cmdreq.flags = CMD_REQ_COMMIT | CMD_REQ_RX;

		cmdreq.rlen = ctrl->status_cmds_rlen[i];

		cmdreq.cb = NULL;

		cmdreq.rbuf = ctrl->status_buf.data;

drivers/video/msm/mdss/mdss_dsi_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void mdss_dsi_panel_bklt_dcs(struct mdss_dsi_ctrl_pdata *ctrl, int level) 
	memset(&cmdreq, 0, sizeof(cmdreq));

	cmdreq.cmds = &backlight_cmd;

	cmdreq.cmds_cnt = 1;

	cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL;

	cmdreq.flags = CMD_REQ_COMMIT;

	cmdreq.rlen = 0;

	cmdreq.cb = NULL;
@@ -495,7 +495,7 @@ static void mdss_dsi_send_col_page_addr(struct mdss_dsi_ctrl_pdata *ctrl, 


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

	cmdreq.cmds_cnt = 2;

	cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL;

	cmdreq.flags = CMD_REQ_COMMIT;

	if (unicast)

		cmdreq.flags |= CMD_REQ_UNICAST;

	cmdreq.rlen = 0;