msm: mdss: move dcs-cmd-by-left out of partial update

dcs-cmd-by-left flag can be set without partial update being
enabled. Therefore remove partial update checking during
parsing dcs-cmd-by-left.

CRs-Fixed: 698733
Change-Id: I3e81ecc95e80a2d2bc970d8d9350cfc7736d1a29
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
This commit is contained in:
Kuogee Hsieh 2014-08-13 10:03:15 -07:00 committed by David Keitel
parent 8a5e775961
commit f9c4def53d
3 changed files with 14 additions and 11 deletions

View file

@ -307,6 +307,8 @@ Optional properties:
- qcom,partial-update-roi-merge: Boolean indicates roi combination is need
and function has been provided for dcs
2A/2B command.
- qcom,dcs-cmd-by-left: Boolean to indicate that dcs command are sent
through the left DSI controller only in a dual-dsi configuration
- qcom,mdss-dsi-lp11-init: Boolean used to enable the DSI clocks and data lanes (low power 11)
before issuing hardware reset line.
- qcom,mdss-dsi-init-delay-us: Delay in microseconds(us) before performing any DSI activity in lp11
@ -459,6 +461,7 @@ Example:
qcom,mdss-tear-check-frame-rate = <6000>;
qcom,mdss-dsi-reset-sequence = <1 2>, <0 10>, <1 10>;
qcom,partial-update-enabled;
qcom,dcs-cmd-by-left;
qcom,mdss-dsi-lp11-init;
qcom,mdss-dsi-init-delay-us = <100>;
mdss-dsi-rx-eot-ignore;

View file

@ -115,7 +115,7 @@ u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,
struct mdss_panel_info *pinfo;
pinfo = &(ctrl->panel_data.panel_info);
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (ctrl->ndx != DSI_CTRL_LEFT)
return -EINVAL;
}
@ -144,7 +144,7 @@ static void mdss_dsi_panel_cmds_send(struct mdss_dsi_ctrl_pdata *ctrl,
struct mdss_panel_info *pinfo;
pinfo = &(ctrl->panel_data.panel_info);
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (ctrl->ndx != DSI_CTRL_LEFT)
return;
}
@ -176,7 +176,7 @@ static void mdss_dsi_panel_bklt_dcs(struct mdss_dsi_ctrl_pdata *ctrl, int level)
struct mdss_panel_info *pinfo;
pinfo = &(ctrl->panel_data.panel_info);
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (ctrl->ndx != DSI_CTRL_LEFT)
return;
}
@ -432,7 +432,7 @@ static int mdss_dsi_set_col_page_addr(struct mdss_panel_data *pdata)
return 0;
}
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (left_or_both && ctrl->ndx == DSI_CTRL_RIGHT) {
/* 2A/2B sent by left already */
return 0;
@ -458,7 +458,7 @@ static int mdss_dsi_set_col_page_addr(struct mdss_panel_data *pdata)
cmdreq.rlen = 0;
cmdreq.cb = NULL;
if (pinfo->partial_update_dcs_cmd_by_left)
if (pinfo->dcs_cmd_by_left)
ctrl = mdss_dsi_get_ctrl_by_index(DSI_CTRL_LEFT);
mdss_dsi_cmdlist_put(ctrl, &cmdreq);
@ -574,7 +574,7 @@ static int mdss_dsi_panel_on(struct mdss_panel_data *pdata)
pr_debug("%s: ctrl=%p ndx=%d\n", __func__, ctrl, ctrl->ndx);
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (ctrl->ndx != DSI_CTRL_LEFT)
goto end;
}
@ -604,7 +604,7 @@ static int mdss_dsi_panel_off(struct mdss_panel_data *pdata)
pr_debug("%s: ctrl=%p ndx=%d\n", __func__, ctrl, ctrl->ndx);
if (pinfo->partial_update_dcs_cmd_by_left) {
if (pinfo->dcs_cmd_by_left) {
if (ctrl->ndx != DSI_CTRL_LEFT)
goto end;
}
@ -1065,13 +1065,13 @@ static int mdss_dsi_parse_panel_features(struct device_node *np,
pinfo->partial_update_enabled);
if (pinfo->partial_update_enabled) {
ctrl->set_col_page_addr = mdss_dsi_set_col_page_addr;
pinfo->partial_update_dcs_cmd_by_left =
of_property_read_bool(np,
"qcom,partial-update-dcs-cmd-by-left");
pinfo->partial_update_roi_merge =
of_property_read_bool(np,
"qcom,partial-update-roi-merge");
}
pinfo->dcs_cmd_by_left = of_property_read_bool(np,
"qcom,dcs-cmd-by-left");
}
pinfo->ulps_feature_enabled = of_property_read_bool(np,

View file

@ -378,7 +378,7 @@ struct mdss_panel_info {
u32 cont_splash_enabled;
u32 partial_update_enabled;
u32 partial_update_dcs_cmd_by_left;
u32 dcs_cmd_by_left;
u32 partial_update_roi_merge;
struct ion_handle *splash_ihdl;
int panel_power_state;