Merge "msm: mdss: Add panel-name in msm_fb_panel_info sysfs node" (2c2b3bdf) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_panel.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -1619,13 +1619,15 @@ int mdss_dsi_panel_init(struct device_node *node,
		pinfo = &ctrl_pdata->panel_data.panel_info;

		pr_debug("%s:%d\n", __func__, __LINE__);
		pinfo->panel_name[0] = '\0';
		panel_name = of_get_property(node, "qcom,mdss-dsi-panel-name", NULL);
		if (!panel_name)
		if (!panel_name) {
		pr_info("%s:%d, Panel name not specified\n",
		__func__, __LINE__);
		else
		} else {
		pr_info("%s: Panel Name = %s\n", __func__, panel_name);

		strlcpy(&pinfo->panel_name[0], panel_name, MDSS_MAX_PANEL_LEN);
		}
		rc = mdss_panel_parse_dt(node, ctrl_pdata);
		if (rc) {
		pr_err("%s:%d panel dt parse failed\n", __func__, __LINE__);

+3 −2

Original line number	Diff line number	Diff line
		@@ -483,12 +483,13 @@ static ssize_t mdss_fb_get_panel_info(struct device *dev,
		ret = scnprintf(buf, PAGE_SIZE,
		"pu_en=%d\nxstart=%d\nwalign=%d\nystart=%d\nhalign=%d\n"
		"min_w=%d\nmin_h=%d\nroi_merge=%d\ndyn_fps_en=%d\n"
		"min_fps=%d\nmax_fps=%d\n",
		"min_fps=%d\nmax_fps=%d\npanel_name=%s\n",
		pinfo->partial_update_enabled, pinfo->xstart_pix_align,
		pinfo->width_pix_align, pinfo->ystart_pix_align,
		pinfo->height_pix_align, pinfo->min_width,
		pinfo->min_height, pinfo->partial_update_roi_merge,
		pinfo->dynamic_fps, pinfo->min_fps, pinfo->max_fps);
		pinfo->dynamic_fps, pinfo->min_fps, pinfo->max_fps,
		pinfo->panel_name);

		return ret;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -395,6 +395,7 @@ struct mdss_panel_info {
		bool is_lpm_mode;
		bool is_split_display;

		char panel_name[MDSS_MAX_PANEL_LEN];
		struct mdss_mdp_pp_tear_check te;

		struct lcd_panel_info lcdc;