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

Commit 76bf746a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: handle reset gpio parsing error properly"

parents 62afdff0 1497c8f0

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -1886,8 +1886,8 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel) 
					      reset_gpio_name, 0);

					      reset_gpio_name, 0);

	if (!gpio_is_valid(panel->reset_config.reset_gpio) &&

	if (!gpio_is_valid(panel->reset_config.reset_gpio) &&

		!panel->host_config.ext_bridge_mode) {

		!panel->host_config.ext_bridge_mode) {

		rc = panel->reset_config.reset_gpio;

		pr_err("[%s] failed get reset gpio, rc=%d\n", panel->name, rc);

		pr_err("[%s] failed get reset gpio, rc=%d\n", panel->name, rc);

		rc = -EINVAL;

		goto error;

		goto error;

	}

	}
@@ -1911,7 +1911,7 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel) 
	if (!gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))

	if (!gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))

		pr_debug("%s:%d mode gpio not specified\n", __func__, __LINE__);

		pr_debug("%s:%d mode gpio not specified\n", __func__, __LINE__);





	pr_err("mode gpio=%d\n", panel->reset_config.lcd_mode_sel_gpio);

	pr_debug("mode gpio=%d\n", panel->reset_config.lcd_mode_sel_gpio);





	data = utils->get_property(utils->data,

	data = utils->get_property(utils->data,

		"qcom,mdss-dsi-mode-sel-gpio-state", NULL);

		"qcom,mdss-dsi-mode-sel-gpio-state", NULL);
@@ -2987,14 +2987,16 @@ struct dsi_panel *dsi_panel_get(struct device *parent, 
		goto error;

		goto error;

	}

	}





	rc = dsi_panel_parse_gpios(panel);

	if (rc) {

		pr_err("failed to parse panel gpios, rc=%d\n", rc);

		goto error;

	}



	rc = dsi_panel_parse_power_cfg(panel);

	rc = dsi_panel_parse_power_cfg(panel);

	if (rc)

	if (rc)

		pr_err("failed to parse power config, rc=%d\n", rc);

		pr_err("failed to parse power config, rc=%d\n", rc);





	rc = dsi_panel_parse_gpios(panel);

	if (rc)

		pr_err("failed to parse panel gpios, rc=%d\n", rc);



	rc = dsi_panel_parse_bl_config(panel);

	rc = dsi_panel_parse_bl_config(panel);

	if (rc)

	if (rc)

		pr_err("failed to parse backlight config, rc=%d\n", rc);

		pr_err("failed to parse backlight config, rc=%d\n", rc);