Merge "drm/msm/dp: fix error handling conditions in lphw hpd" into dev/msm-4.14-display (1e52b82a) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+4 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -54,21 +54,21 @@ struct dp_hpd dp_hpd_get(struct device dev, struct dp_parser *parser,

		if (parser->no_aux_switch && parser->lphw_hpd) {
		dp_hpd = dp_lphw_hpd_get(dev, parser, catalog, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get lphw hpd\n");
		return dp_hpd;
		}
		dp_hpd->type = DP_HPD_LPHW;
		} else if (parser->no_aux_switch) {
		dp_hpd = dp_gpio_hpd_get(dev, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get gpio hpd\n");
		goto out;
		}
		dp_hpd->type = DP_HPD_GPIO;
		} else {
		dp_hpd = dp_usbpd_get(dev, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get usbpd\n");
		goto out;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,8 @@ static int dp_parser_pinctrl(struct dp_parser *parser)
		pinctrl->pin, "mdss_dp_hpd_ctrl");
		}

		if (!pinctrl->state_hpd_tlmm \|\| !pinctrl->state_hpd_ctrl) {
		if (IS_ERR_OR_NULL(pinctrl->state_hpd_tlmm) \|\|
		IS_ERR_OR_NULL(pinctrl->state_hpd_ctrl)) {
		pinctrl->state_hpd_tlmm = NULL;
		pinctrl->state_hpd_ctrl = NULL;
		pr_debug("tlmm or ctrl pinctrl state does not exist\n");