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

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

Merge "drm/msm/dp: add support for Mini DisplayPort"

parents 17b302c0 5eeba8cb

drivers/gpu/drm/msm/dp/dp_gpio_hpd.c

+15 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ struct dp_hpd *dp_gpio_hpd_get(struct device *dev, 
	int rc = 0;

	const char *hpd_gpio_name = "qcom,dp-hpd-gpio";

	struct dp_gpio_hpd_private *gpio_hpd;

	struct dp_pinctrl pinctrl = {0};

	int edge;



	if (!dev || !cb) {
@@ -207,6 +208,20 @@ struct dp_hpd *dp_gpio_hpd_get(struct device *dev, 
		goto error;

	}



	pinctrl.pin = devm_pinctrl_get(dev);

	if (!IS_ERR_OR_NULL(pinctrl.pin)) {

		pinctrl.state_hpd_active = pinctrl_lookup_state(pinctrl.pin,

						"mdss_dp_hpd_active");

		if (!IS_ERR_OR_NULL(pinctrl.state_hpd_active)) {

			rc = pinctrl_select_state(pinctrl.pin,

					pinctrl.state_hpd_active);

			if (rc) {

				pr_err("failed to set hpd active state\n");

				goto gpio_error;

			}

		}

	}



	gpio_hpd->gpio_cfg.gpio = of_get_named_gpio(dev->of_node,

		hpd_gpio_name, 0);

	if (!gpio_is_valid(gpio_hpd->gpio_cfg.gpio)) {

drivers/gpu/drm/msm/dp/dp_power.c

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ static int dp_power_pinctrl_set(struct dp_power_private *power, bool active) 


	parser = power->parser;



	if (parser && parser->no_aux_switch)

		return 0;



	if (IS_ERR_OR_NULL(parser->pinctrl.pin))

		return PTR_ERR(parser->pinctrl.pin);