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

Commit 9f159123 authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding
Browse files

drm/tegra: hdmi: Detect DVI-only displays 



Use EDID data to determine whether the display supports HDMI or DVI
only. The HDMI output used to assume to be connected to HDMI displays,
but that broke support for DVI displays that don't understand the
interspersed audio/other data.

To be on the safe side, default to DVI if no EDID data is available.

Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
[treding@nvidia.com: move detection to separate function]
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 7d1d28ac

drivers/gpu/drm/tegra/hdmi.c

+14 −0
Original line number Diff line number Diff line
@@ -674,6 +674,18 @@ static void tegra_hdmi_setup_tmds(struct tegra_hdmi *hdmi, 
				  HDMI_NV_PDISP_SOR_IO_PEAK_CURRENT);

}



static bool tegra_output_is_hdmi(struct tegra_output *output)

{

	struct edid *edid;



	if (!output->connector.edid_blob_ptr)

		return false;



	edid = (struct edid *)output->connector.edid_blob_ptr->data;



	return drm_detect_hdmi_monitor(edid);

}



static int tegra_output_hdmi_enable(struct tegra_output *output)

{

	unsigned int h_sync_width, h_front_porch, h_back_porch, i, rekey;
@@ -686,6 +698,8 @@ static int tegra_output_hdmi_enable(struct tegra_output *output) 
	int retries = 1000;

	int err;



	hdmi->dvi = !tegra_output_is_hdmi(output);



	pclk = mode->clock * 1000;

	h_sync_width = mode->hsync_end - mode->hsync_start;

	h_back_porch = mode->htotal - mode->hsync_end;