Commit 98365ca7 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/tegra: convert to struct drm_edid 



Prefer the struct drm_edid based functions for reading the EDID and
updating the connector.

Acked-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/e764b50f4ad2de95e449ccb37f49c3f37b3333fc.1724348429.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent f7945d9f

drivers/gpu/drm/tegra/drm.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ struct tegra_output { 
	struct drm_bridge *bridge;

	struct drm_panel *panel;

	struct i2c_adapter *ddc;

	const struct edid *edid;

	const struct drm_edid *drm_edid;

	struct cec_notifier *cec;

	unsigned int hpd_irq;

	struct gpio_desc *hpd_gpio;

drivers/gpu/drm/tegra/output.c

+17 −12
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
int tegra_output_connector_get_modes(struct drm_connector *connector)

{

	struct tegra_output *output = connector_to_output(connector);

	struct edid *edid = NULL;

	const struct drm_edid *drm_edid;

	int err = 0;



	/*
@@ -34,18 +34,17 @@ int tegra_output_connector_get_modes(struct drm_connector *connector) 
			return err;

	}



	if (output->edid)

		edid = kmemdup(output->edid, sizeof(*edid), GFP_KERNEL);

	if (output->drm_edid)

		drm_edid = drm_edid_dup(output->drm_edid);

	else if (output->ddc)

		edid = drm_get_edid(connector, output->ddc);

		drm_edid = drm_edid_read_ddc(connector, output->ddc);



	cec_notifier_set_phys_addr_from_edid(output->cec, edid);

	drm_connector_update_edid_property(connector, edid);

	drm_edid_connector_update(connector, drm_edid);

	cec_notifier_set_phys_addr(output->cec,

				   connector->display_info.source_physical_address);



	if (edid) {

		err = drm_add_edid_modes(connector, edid);

		kfree(edid);

	}

	err = drm_edid_connector_add_modes(connector);

	drm_edid_free(drm_edid);



	return err;

}
@@ -98,6 +97,7 @@ static irqreturn_t hpd_irq(int irq, void *data) 
int tegra_output_probe(struct tegra_output *output)

{

	struct device_node *ddc, *panel;

	const void *edid;

	unsigned long flags;

	int err, size;
@@ -124,8 +124,6 @@ int tegra_output_probe(struct tegra_output *output) 
			return PTR_ERR(output->panel);

	}



	output->edid = of_get_property(output->of_node, "nvidia,edid", &size);



	ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0);

	if (ddc) {

		output->ddc = of_get_i2c_adapter_by_node(ddc);
@@ -137,6 +135,9 @@ int tegra_output_probe(struct tegra_output *output) 
		}

	}



	edid = of_get_property(output->of_node, "nvidia,edid", &size);

	output->drm_edid = drm_edid_alloc(edid, size);



	output->hpd_gpio = devm_fwnode_gpiod_get(output->dev,

					of_fwnode_handle(output->of_node),

					"nvidia,hpd",
@@ -187,6 +188,8 @@ int tegra_output_probe(struct tegra_output *output) 
	if (output->ddc)

		i2c_put_adapter(output->ddc);



	drm_edid_free(output->drm_edid);



	return err;

}
@@ -197,6 +200,8 @@ void tegra_output_remove(struct tegra_output *output) 


	if (output->ddc)

		i2c_put_adapter(output->ddc);



	drm_edid_free(output->drm_edid);

}



int tegra_output_init(struct drm_device *drm, struct tegra_output *output)