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

Commit 4f075366 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: Share minimum width and height limitations on panel ROI"

parents 62b35dc4 d3771ab6

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

+3 −2
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ Optional properties: 
- qcom,mdss-dsi-tx-eot-append:		Boolean used to enable appending end of transmission packets.

- qcom,ulps-enabled:			Boolean to enable support for Ultra Low Power State (ULPS) mode.

- qcom,panel-roi-alignment:		Specifies the panel ROI alignment restrictions on its

					left, top, width and height values

					left, top, width, height alignments and minimum width and

					height values



Note, if a given optional qcom,* binding is not present, then the driver will configure

the default values specified.
@@ -410,6 +411,6 @@ Example: 
		mdss-dsi-rx-eot-ignore;

		mdss-dsi-tx-eot-append;

		qcom,ulps-enabled;

		qcom,panel-roi-alignment = <4 4 2 2>;

		qcom,panel-roi-alignment = <4 4 2 2 20 20>;

	};

};

drivers/video/msm/mdss/mdss_dsi_panel.c

+9 −5
Original line number Diff line number Diff line
@@ -751,11 +751,11 @@ static void mdss_dsi_parse_roi_alignment(struct device_node *np, 
		struct mdss_panel_info *pinfo)

{

	int len = 0;

	u32 value[4];

	u32 value[6];

	struct property *data;

	data = of_find_property(np, "qcom,panel-roi-alignment", &len);

	len /= sizeof(u32);

	if (!data || (len != 4)) {

	if (!data || (len != 6)) {

		pr_debug("%s: Panel roi alignment not found", __func__);

	} else {

		int rc = of_property_read_u32_array(np,
@@ -768,11 +768,15 @@ static void mdss_dsi_parse_roi_alignment(struct device_node *np, 
			pinfo->width_pix_align = value[1];

			pinfo->ystart_pix_align = value[2];

			pinfo->height_pix_align = value[3];

			pinfo->min_width = value[4];

			pinfo->min_height = value[5];

		}



		pr_debug("%s: coordinate rules: [%d, %d, %d, %d]", __func__,

			pinfo->xstart_pix_align, pinfo->width_pix_align,

			pinfo->ystart_pix_align, pinfo->height_pix_align);

		pr_debug("%s: ROI alignment: [%d, %d, %d, %d, %d, %d]",

				__func__, pinfo->xstart_pix_align,

				pinfo->width_pix_align, pinfo->ystart_pix_align,

				pinfo->height_pix_align, pinfo->min_width,

				pinfo->min_height);

	}

}

drivers/video/msm/mdss/mdss_fb.c

+4 −2
Original line number Diff line number Diff line
@@ -471,10 +471,12 @@ static ssize_t mdss_fb_get_panel_info(struct device *dev, 
	int ret;



	ret = scnprintf(buf, PAGE_SIZE,

			"pu_en=%d\nxalign=%d\nwalign=%d\nystart=%d\nhalign=%d",

			"pu_en=%d\nxalign=%d\nwalign=%d\nystart=%d\nhalign=%d\n"

			"min_w=%d\nmin_h=%d",

			pinfo->partial_update_enabled, pinfo->xstart_pix_align,

			pinfo->width_pix_align, pinfo->ystart_pix_align,

			pinfo->height_pix_align);

			pinfo->height_pix_align, pinfo->min_width,

			pinfo->min_height);



	return ret;

}

drivers/video/msm/mdss/mdss_panel.h

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ struct mdss_panel_info { 
	u32 width_pix_align;

	u32 ystart_pix_align;

	u32 height_pix_align;

	u32 min_width;

	u32 min_height;



	u32 cont_splash_enabled;

	u32 partial_update_enabled;