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

Commit 429eec80 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: enable right-only update on DUAL_LM_SINGLE_DISPLAY split mode"

parents c77ae5c5 c04a713c

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+0 −7
Original line number Diff line number Diff line
@@ -444,9 +444,6 @@ Optional properites: 
- qcom,mdss-dsc-bit-per-component: 	An integer value indicates the bits per component before compression.

- qcom,mdss-dsc-bit-per-pixel:		An integer value indicates the bits per pixel after compression.

- qcom,mdss-dsc-block-prediction-enable: A boolean value to enable/disable the block prediction at decoder.

- qcom,mdss-dsc-ich-reset-value: 	An integer value defines the Indexed Color History reset value.

- qcom,mdss-dsc-ich-reset-override:	An integer value defines the Indexed Color History for each line in

					slice.

- qcom,mdss-dsc-config-by-manufacture-cmd: A boolean to indicates panel use manufacture command to setup pps

					instead of standard dcs type 0x0A.

- qcom,adjust-timer-wakeup-ms:		An integer value to indicate the timer delay(in ms) to accommodate
@@ -674,8 +671,6 @@ Example: 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};
@@ -687,8 +682,6 @@ Example: 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};

arch/arm/boot/dts/qcom/dsi-panel-nt35597-dsc-wqxga-cmd.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};



		dsi_nt35597_dsc_cmd_config1: config1 {
@@ -116,9 +113,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};



		dsi_nt35597_dsc_cmd_config2: config2 {
@@ -131,9 +125,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};

	};

};

arch/arm/boot/dts/qcom/dsi-panel-nt35597-dsc-wqxga-video.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};



		dsi_nt35597_dsc_video_config1: config1 {
@@ -105,9 +102,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};



		dsi_nt35597_dsc_video_config2: config2 {
@@ -120,9 +114,6 @@ 
			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			qcom,mdss-dsc-ich-reset-value = <0>;

			qcom,mdss-dsc-ich-reset-override = <0>;

			qcom,mdss-dsc-config-by-manufacture-cmd;

		};

	};

};

drivers/video/msm/mdss/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ enum mdss_hw_quirk { 
	MDSS_QUIRK_BWCPANIC,

	MDSS_QUIRK_ROTCDP,

	MDSS_QUIRK_DOWNSCALE_HANG,

	MDSS_QUIRK_DSC_RIGHT_ONLY_PU,

	MDSS_QUIRK_MAX,

};

drivers/video/msm/mdss/mdss_dsi.c

+17 −3
Original line number Diff line number Diff line
@@ -1952,9 +1952,14 @@ static int mdss_dsi_set_stream_size(struct mdss_panel_data *pdata) 


	/* DSI_COMMAND_MODE_MDP_STREAM_CTRL */

	if (dsc) {

		stream_ctrl = ((dsc->bytes_in_slice + 1) << 16) |

			(pdata->panel_info.mipi.vc << 8) | DTYPE_DCS_LWRITE;

		stream_total = roi->h << 16 | dsc->pclk_per_line;

		u16 byte_num =  dsc->bytes_per_pkt;



		if (pinfo->mipi.insert_dcs_cmd)

			byte_num++;



		stream_ctrl = (byte_num << 16) | (pinfo->mipi.vc << 8) |

				DTYPE_DCS_LWRITE;

		stream_total = dsc->pic_height << 16 | dsc->pclk_per_line;

	} else  {



		stream_ctrl = (((roi->w * 3) + 1) << 16) |
@@ -1987,6 +1992,9 @@ static int mdss_dsi_set_stream_size(struct mdss_panel_data *pdata) 


	MIPI_OUTP((ctrl_pdata->ctrl_base) + 0x194, idle);



	if (dsc)

		mdss_dsi_dsc_config(ctrl_pdata, dsc);



	return 0;

}
@@ -2058,11 +2066,13 @@ static int mdss_dsi_event_handler(struct mdss_panel_data *pdata, 
	struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;

	int power_state;

	u32 mode;

	struct mdss_panel_info *pinfo;



	if (pdata == NULL) {

		pr_err("%s: Invalid input data\n", __func__);

		return -EINVAL;

	}

	pinfo = &pdata->panel_info;

	ctrl_pdata = container_of(pdata, struct mdss_dsi_ctrl_pdata,

				panel_data);

	pr_debug("%s+: ctrl=%d event=%d\n", __func__, ctrl_pdata->ndx, event);
@@ -2135,6 +2145,10 @@ static int mdss_dsi_event_handler(struct mdss_panel_data *pdata, 
			rc = mdss_dsi_blank(pdata, MDSS_PANEL_POWER_OFF);

		}

		break;

	case MDSS_EVENT_DSC_PPS_SEND:

		if (pinfo->compression_mode == COMPRESSION_DSC)

			mdss_dsi_panel_dsc_pps_send(ctrl_pdata, pinfo);

		break;

	case MDSS_EVENT_ENABLE_PARTIAL_ROI:

		rc = mdss_dsi_ctl_partial_roi(pdata);

		break;