Commit abffedaa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/tegra/for-5.3-rc4' of git://anongit.freedesktop.org/tegra/linux into drm-fixes 



drm/tegra: Fixes for v5.3-rc4

This contains a single fix for a regression introduced by a combination
of a GPIO and a drm/tegra patch merged in v5.3-rc1.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807140634.29166-1-thierry.reding@gmail.com
parents e21a712a 2a6fc3cb

drivers/gpu/drm/tegra/output.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -126,9 +126,13 @@ int tegra_output_probe(struct tegra_output *output) 
						       "nvidia,hpd-gpio", 0,

						       "nvidia,hpd-gpio", 0,

						       GPIOD_IN,

						       GPIOD_IN,

						       "HDMI hotplug detect");

						       "HDMI hotplug detect");

	if (IS_ERR(output->hpd_gpio))

	if (IS_ERR(output->hpd_gpio)) {

		if (PTR_ERR(output->hpd_gpio) != -ENOENT)

			return PTR_ERR(output->hpd_gpio);

			return PTR_ERR(output->hpd_gpio);





		output->hpd_gpio = NULL;

	}



	if (output->hpd_gpio) {

	if (output->hpd_gpio) {

		err = gpiod_to_irq(output->hpd_gpio);

		err = gpiod_to_irq(output->hpd_gpio);

		if (err < 0) {

		if (err < 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE