dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/6] drm: conversions to struct drm_edid
@ 2024-08-22 17:42 Jani Nikula
  2024-08-22 17:42 ` [PATCH 1/6] drm/sti/sti_hdmi: convert " Jani Nikula
                   ` (6 more replies)
  0 siblings, 7 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel; +Cc: jani.nikula

The umerged patches from [1] and then some.

BR,
Jani.

[1] https://lore.kernel.org/r/cover.1715691257.git.jani.nikula@intel.com

Jani Nikula (6):
  drm/sti/sti_hdmi: convert to struct drm_edid
  drm/exynos: hdmi: use display_info for printing display dimensions
  drm/exynos: hdmi: convert to struct drm_edid
  drm/tegra: convert to struct drm_edid
  drm/ipuv3/parallel: convert to struct drm_edid
  drm/tiny/gm12u320: convert to struct drm_edid

 drivers/gpu/drm/exynos/exynos_hdmi.c         | 25 ++++++++++-------
 drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 ++++++----
 drivers/gpu/drm/sti/sti_hdmi.c               | 24 +++++++++-------
 drivers/gpu/drm/tegra/drm.h                  |  2 +-
 drivers/gpu/drm/tegra/output.c               | 29 ++++++++++++--------
 drivers/gpu/drm/tiny/gm12u320.c              | 13 +++++++--
 6 files changed, 66 insertions(+), 41 deletions(-)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [PATCH 1/6] drm/sti/sti_hdmi: convert to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-22 17:42 ` [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions Jani Nikula
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Daniel Vetter, Alain Volmat, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann

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

The functional change is that the CEC physical address gets invalidated
when the EDID could not be read.

v2: Use drm_edid_read() instead of drm_edid_read_ddc() (Sima)

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Alain Volmat <alain.volmat@foss.st.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/sti/sti_hdmi.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index b0d84440a87b..847470f747c0 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -974,28 +974,32 @@ static const struct drm_bridge_funcs sti_hdmi_bridge_funcs = {
 
 static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
 {
+	const struct drm_display_info *info = &connector->display_info;
 	struct sti_hdmi_connector *hdmi_connector
 		= to_sti_hdmi_connector(connector);
 	struct sti_hdmi *hdmi = hdmi_connector->hdmi;
-	struct edid *edid;
+	const struct drm_edid *drm_edid;
 	int count;
 
 	DRM_DEBUG_DRIVER("\n");
 
-	edid = drm_get_edid(connector, hdmi->ddc_adapt);
-	if (!edid)
-		goto fail;
+	drm_edid = drm_edid_read(connector);
+
+	drm_edid_connector_update(connector, drm_edid);
 
-	cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
+	cec_notifier_set_phys_addr(hdmi->notifier,
+				   connector->display_info.source_physical_address);
+
+	if (!drm_edid)
+		goto fail;
 
-	count = drm_add_edid_modes(connector, edid);
-	drm_connector_update_edid_property(connector, edid);
+	count = drm_edid_connector_add_modes(connector);
 
 	DRM_DEBUG_KMS("%s : %dx%d cm\n",
-		      (connector->display_info.is_hdmi ? "hdmi monitor" : "dvi monitor"),
-		      edid->width_cm, edid->height_cm);
+		      info->is_hdmi ? "hdmi monitor" : "dvi monitor",
+		      info->width_mm / 10, info->height_mm / 10);
 
-	kfree(edid);
+	drm_edid_free(drm_edid);
 	return count;
 
 fail:
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
  2024-08-22 17:42 ` [PATCH 1/6] drm/sti/sti_hdmi: convert " Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-28 12:44   ` Daniel Vetter
  2024-08-22 17:42 ` [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid Jani Nikula
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Inki Dae, Seung-Woo Kim, Kyungmin Park,
	Krzysztof Kozlowski, Alim Akhtar, linux-arm-kernel,
	linux-samsung-soc

Look up display dimensions from display_info instead of the EDID
directly. This will be helpful for the follow-up work.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 1e26cd4f8347..25d508b25921 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -883,6 +883,7 @@ static const struct drm_connector_funcs hdmi_connector_funcs = {
 static int hdmi_get_modes(struct drm_connector *connector)
 {
 	struct hdmi_context *hdata = connector_to_hdmi(connector);
+	const struct drm_display_info *info = &connector->display_info;
 	struct edid *edid;
 	int ret;
 
@@ -893,10 +894,10 @@ static int hdmi_get_modes(struct drm_connector *connector)
 	if (!edid)
 		goto no_edid;
 
-	hdata->dvi_mode = !connector->display_info.is_hdmi;
+	hdata->dvi_mode = !info->is_hdmi;
 	DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
 			  (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
-			  edid->width_cm, edid->height_cm);
+			  info->width_mm / 10, info->height_mm / 10);
 
 	drm_connector_update_edid_property(connector, edid);
 	cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
  2024-08-22 17:42 ` [PATCH 1/6] drm/sti/sti_hdmi: convert " Jani Nikula
  2024-08-22 17:42 ` [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-28 12:45   ` Daniel Vetter
  2024-08-22 17:42 ` [PATCH 4/6] drm/tegra: " Jani Nikula
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Inki Dae, Seung-Woo Kim, Kyungmin Park,
	Krzysztof Kozlowski, Alim Akhtar, linux-arm-kernel,
	linux-samsung-soc

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

The functional change is that the CEC physical address gets invalidated
when the EDID could not be read.

v2:
- display info usage was split to a separate patch
- check drm_edid_connector_update() return value

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 25d508b25921..c9d4b9146df9 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -884,14 +884,21 @@ static int hdmi_get_modes(struct drm_connector *connector)
 {
 	struct hdmi_context *hdata = connector_to_hdmi(connector);
 	const struct drm_display_info *info = &connector->display_info;
-	struct edid *edid;
+	const struct drm_edid *drm_edid;
 	int ret;
 
 	if (!hdata->ddc_adpt)
 		goto no_edid;
 
-	edid = drm_get_edid(connector, hdata->ddc_adpt);
-	if (!edid)
+	drm_edid = drm_edid_read_ddc(connector, hdata->ddc_adpt);
+
+	ret = drm_edid_connector_update(connector, drm_edid);
+	if (ret)
+		return 0;
+
+	cec_notifier_set_phys_addr(hdata->notifier, info->source_physical_address);
+
+	if (!drm_edid)
 		goto no_edid;
 
 	hdata->dvi_mode = !info->is_hdmi;
@@ -899,12 +906,9 @@ static int hdmi_get_modes(struct drm_connector *connector)
 			  (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
 			  info->width_mm / 10, info->height_mm / 10);
 
-	drm_connector_update_edid_property(connector, edid);
-	cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
-
-	ret = drm_add_edid_modes(connector, edid);
+	ret = drm_edid_connector_add_modes(connector);
 
-	kfree(edid);
+	drm_edid_free(drm_edid);
 
 	return ret;
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 4/6] drm/tegra: convert to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
                   ` (2 preceding siblings ...)
  2024-08-22 17:42 ` [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-28 12:46   ` Daniel Vetter
  2024-08-29  8:55   ` Thierry Reding
  2024-08-22 17:42 ` [PATCH 5/6] drm/ipuv3/parallel: " Jani Nikula
                   ` (2 subsequent siblings)
  6 siblings, 2 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Thierry Reding, Mikko Perttunen, Jonathan Hunter,
	linux-tegra

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Mikko Perttunen <mperttunen@nvidia.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
---
 drivers/gpu/drm/tegra/drm.h    |  2 +-
 drivers/gpu/drm/tegra/output.c | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 682011166a8f..2f3781e04b0a 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -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;
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index 4da3c3d1abbc..e6b5863fec71 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -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)
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 5/6] drm/ipuv3/parallel: convert to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
                   ` (3 preceding siblings ...)
  2024-08-22 17:42 ` [PATCH 4/6] drm/tegra: " Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-28 12:48   ` Daniel Vetter
  2024-08-22 17:42 ` [PATCH 6/6] drm/tiny/gm12u320: " Jani Nikula
  2024-08-29 11:44 ` [PATCH 0/6] drm: conversions " Jani Nikula
  6 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Philipp Zabel, Maarten Lankhorst, Maxime Ripard,
	Thomas Zimmermann, Shawn Guo, Sascha Hauer,
	Pengutronix Kernel Team, Fabio Estevam, imx, linux-arm-kernel

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: imx@lists.linux.dev
Cc: linux-arm-kernel@lists.infradead.org
---
 drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
index 55dedd73f528..91d7808a2d8d 100644
--- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
+++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
@@ -34,7 +34,7 @@ struct imx_parallel_display_encoder {
 
 struct imx_parallel_display {
 	struct device *dev;
-	void *edid;
+	const struct drm_edid *drm_edid;
 	u32 bus_format;
 	u32 bus_flags;
 	struct drm_display_mode mode;
@@ -62,9 +62,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
 	if (num_modes > 0)
 		return num_modes;
 
-	if (imxpd->edid) {
-		drm_connector_update_edid_property(connector, imxpd->edid);
-		num_modes = drm_add_edid_modes(connector, imxpd->edid);
+	if (imxpd->drm_edid) {
+		drm_edid_connector_update(connector, imxpd->drm_edid);
+		num_modes = drm_edid_connector_add_modes(connector);
 	}
 
 	if (np) {
@@ -331,7 +331,7 @@ static int imx_pd_probe(struct platform_device *pdev)
 
 	edidp = of_get_property(np, "edid", &edid_len);
 	if (edidp)
-		imxpd->edid = devm_kmemdup(dev, edidp, edid_len, GFP_KERNEL);
+		imxpd->drm_edid = drm_edid_alloc(edidp, edid_len);
 
 	ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
 	if (!ret) {
@@ -355,7 +355,11 @@ static int imx_pd_probe(struct platform_device *pdev)
 
 static void imx_pd_remove(struct platform_device *pdev)
 {
+	struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
+
 	component_del(&pdev->dev, &imx_pd_ops);
+
+	drm_edid_free(imxpd->drm_edid);
 }
 
 static const struct of_device_id imx_pd_dt_ids[] = {
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH 6/6] drm/tiny/gm12u320: convert to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
                   ` (4 preceding siblings ...)
  2024-08-22 17:42 ` [PATCH 5/6] drm/ipuv3/parallel: " Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
  2024-08-28 12:49   ` Daniel Vetter
  2024-08-28 12:52   ` Thomas Zimmermann
  2024-08-29 11:44 ` [PATCH 0/6] drm: conversions " Jani Nikula
  6 siblings, 2 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-22 17:42 UTC (permalink / raw)
  To: dri-devel
  Cc: jani.nikula, Hans de Goede, Maarten Lankhorst, Maxime Ripard,
	Thomas Zimmermann

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/tiny/gm12u320.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tiny/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c
index e0defb1d134f..0bd7707c053e 100644
--- a/drivers/gpu/drm/tiny/gm12u320.c
+++ b/drivers/gpu/drm/tiny/gm12u320.c
@@ -464,7 +464,7 @@ static int gm12u320_set_ecomode(struct gm12u320_device *gm12u320)
  * Note this assumes this driver is only ever used with the Acer C120, if we
  * add support for other devices the vendor and model should be parameterized.
  */
-static struct edid gm12u320_edid = {
+static const struct edid gm12u320_edid = {
 	.header		= { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 },
 	.mfg_id		= { 0x04, 0x72 },	/* "ACR" */
 	.prod_code	= { 0x20, 0xc1 },	/* C120h */
@@ -523,8 +523,15 @@ static struct edid gm12u320_edid = {
 
 static int gm12u320_conn_get_modes(struct drm_connector *connector)
 {
-	drm_connector_update_edid_property(connector, &gm12u320_edid);
-	return drm_add_edid_modes(connector, &gm12u320_edid);
+	const struct drm_edid *drm_edid;
+	int count;
+
+	drm_edid = drm_edid_alloc(&gm12u320_edid, sizeof(gm12u320_edid));
+	drm_edid_connector_update(connector, drm_edid);
+	count = drm_edid_connector_add_modes(connector);
+	drm_edid_free(drm_edid);
+
+	return count;
 }
 
 static const struct drm_connector_helper_funcs gm12u320_conn_helper_funcs = {
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions
  2024-08-22 17:42 ` [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions Jani Nikula
@ 2024-08-28 12:44   ` Daniel Vetter
  0 siblings, 0 replies; 19+ messages in thread
From: Daniel Vetter @ 2024-08-28 12:44 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, Inki Dae, Seung-Woo Kim, Kyungmin Park,
	Krzysztof Kozlowski, Alim Akhtar, linux-arm-kernel,
	linux-samsung-soc

On Thu, Aug 22, 2024 at 08:42:48PM +0300, Jani Nikula wrote:
> Look up display dimensions from display_info instead of the EDID
> directly. This will be helpful for the follow-up work.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> 
> ---
> 
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Alim Akhtar <alim.akhtar@samsung.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-samsung-soc@vger.kernel.org
> ---
>  drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 1e26cd4f8347..25d508b25921 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -883,6 +883,7 @@ static const struct drm_connector_funcs hdmi_connector_funcs = {
>  static int hdmi_get_modes(struct drm_connector *connector)
>  {
>  	struct hdmi_context *hdata = connector_to_hdmi(connector);
> +	const struct drm_display_info *info = &connector->display_info;
>  	struct edid *edid;
>  	int ret;
>  
> @@ -893,10 +894,10 @@ static int hdmi_get_modes(struct drm_connector *connector)
>  	if (!edid)
>  		goto no_edid;
>  
> -	hdata->dvi_mode = !connector->display_info.is_hdmi;
> +	hdata->dvi_mode = !info->is_hdmi;
>  	DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
>  			  (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
> -			  edid->width_cm, edid->height_cm);
> +			  info->width_mm / 10, info->height_mm / 10);
>  
>  	drm_connector_update_edid_property(connector, edid);
>  	cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
> -- 
> 2.39.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid Jani Nikula
@ 2024-08-28 12:45   ` Daniel Vetter
  0 siblings, 0 replies; 19+ messages in thread
From: Daniel Vetter @ 2024-08-28 12:45 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, Inki Dae, Seung-Woo Kim, Kyungmin Park,
	Krzysztof Kozlowski, Alim Akhtar, linux-arm-kernel,
	linux-samsung-soc

On Thu, Aug 22, 2024 at 08:42:49PM +0300, Jani Nikula wrote:
> Prefer the struct drm_edid based functions for reading the EDID and
> updating the connector.
> 
> The functional change is that the CEC physical address gets invalidated
> when the EDID could not be read.
> 
> v2:
> - display info usage was split to a separate patch
> - check drm_edid_connector_update() return value
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> ---
> 
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Alim Akhtar <alim.akhtar@samsung.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-samsung-soc@vger.kernel.org
> ---
>  drivers/gpu/drm/exynos/exynos_hdmi.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 25d508b25921..c9d4b9146df9 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -884,14 +884,21 @@ static int hdmi_get_modes(struct drm_connector *connector)
>  {
>  	struct hdmi_context *hdata = connector_to_hdmi(connector);
>  	const struct drm_display_info *info = &connector->display_info;
> -	struct edid *edid;
> +	const struct drm_edid *drm_edid;
>  	int ret;
>  
>  	if (!hdata->ddc_adpt)
>  		goto no_edid;
>  
> -	edid = drm_get_edid(connector, hdata->ddc_adpt);
> -	if (!edid)
> +	drm_edid = drm_edid_read_ddc(connector, hdata->ddc_adpt);

hdmi_create_connector seems to set up the right ddc already, so I think
drm_edid_read should be working. With that:

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> +
> +	ret = drm_edid_connector_update(connector, drm_edid);
> +	if (ret)
> +		return 0;
> +
> +	cec_notifier_set_phys_addr(hdata->notifier, info->source_physical_address);
> +
> +	if (!drm_edid)
>  		goto no_edid;
>  
>  	hdata->dvi_mode = !info->is_hdmi;
> @@ -899,12 +906,9 @@ static int hdmi_get_modes(struct drm_connector *connector)
>  			  (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
>  			  info->width_mm / 10, info->height_mm / 10);
>  
> -	drm_connector_update_edid_property(connector, edid);
> -	cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
> -
> -	ret = drm_add_edid_modes(connector, edid);
> +	ret = drm_edid_connector_add_modes(connector);
>  
> -	kfree(edid);
> +	drm_edid_free(drm_edid);
>  
>  	return ret;
>  
> -- 
> 2.39.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 4/6] drm/tegra: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 4/6] drm/tegra: " Jani Nikula
@ 2024-08-28 12:46   ` Daniel Vetter
  2024-08-29  8:55   ` Thierry Reding
  1 sibling, 0 replies; 19+ messages in thread
From: Daniel Vetter @ 2024-08-28 12:46 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, Thierry Reding, Mikko Perttunen, Jonathan Hunter,
	linux-tegra

On Thu, Aug 22, 2024 at 08:42:50PM +0300, Jani Nikula wrote:
> Prefer the struct drm_edid based functions for reading the EDID and
> updating the connector.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

This time a slightly less blind ...

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

:-)

> 
> ---
> 
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Cc: Mikko Perttunen <mperttunen@nvidia.com>
> Cc: Jonathan Hunter <jonathanh@nvidia.com>
> Cc: linux-tegra@vger.kernel.org
> ---
>  drivers/gpu/drm/tegra/drm.h    |  2 +-
>  drivers/gpu/drm/tegra/output.c | 29 +++++++++++++++++------------
>  2 files changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
> index 682011166a8f..2f3781e04b0a 100644
> --- a/drivers/gpu/drm/tegra/drm.h
> +++ b/drivers/gpu/drm/tegra/drm.h
> @@ -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;
> diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
> index 4da3c3d1abbc..e6b5863fec71 100644
> --- a/drivers/gpu/drm/tegra/output.c
> +++ b/drivers/gpu/drm/tegra/output.c
> @@ -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)
> -- 
> 2.39.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 5/6] drm/ipuv3/parallel: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 5/6] drm/ipuv3/parallel: " Jani Nikula
@ 2024-08-28 12:48   ` Daniel Vetter
  0 siblings, 0 replies; 19+ messages in thread
From: Daniel Vetter @ 2024-08-28 12:48 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, Philipp Zabel, Maarten Lankhorst, Maxime Ripard,
	Thomas Zimmermann, Shawn Guo, Sascha Hauer,
	Pengutronix Kernel Team, Fabio Estevam, imx, linux-arm-kernel

On Thu, Aug 22, 2024 at 08:42:51PM +0300, Jani Nikula wrote:
> Prefer the struct drm_edid based functions for storing the EDID and
> updating the connector.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> ---
> 
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: imx@lists.linux.dev
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>  drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> index 55dedd73f528..91d7808a2d8d 100644
> --- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> +++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> @@ -34,7 +34,7 @@ struct imx_parallel_display_encoder {
>  
>  struct imx_parallel_display {
>  	struct device *dev;
> -	void *edid;
> +	const struct drm_edid *drm_edid;
>  	u32 bus_format;
>  	u32 bus_flags;
>  	struct drm_display_mode mode;
> @@ -62,9 +62,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
>  	if (num_modes > 0)
>  		return num_modes;
>  
> -	if (imxpd->edid) {
> -		drm_connector_update_edid_property(connector, imxpd->edid);
> -		num_modes = drm_add_edid_modes(connector, imxpd->edid);
> +	if (imxpd->drm_edid) {
> +		drm_edid_connector_update(connector, imxpd->drm_edid);
> +		num_modes = drm_edid_connector_add_modes(connector);
>  	}
>  
>  	if (np) {
> @@ -331,7 +331,7 @@ static int imx_pd_probe(struct platform_device *pdev)
>  
>  	edidp = of_get_property(np, "edid", &edid_len);
>  	if (edidp)
> -		imxpd->edid = devm_kmemdup(dev, edidp, edid_len, GFP_KERNEL);
> +		imxpd->drm_edid = drm_edid_alloc(edidp, edid_len);

Randomly wondering whether drm_edid_alloc should at least sanity check the
edid size ... but for another time. On this:

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

>  
>  	ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
>  	if (!ret) {
> @@ -355,7 +355,11 @@ static int imx_pd_probe(struct platform_device *pdev)
>  
>  static void imx_pd_remove(struct platform_device *pdev)
>  {
> +	struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
> +
>  	component_del(&pdev->dev, &imx_pd_ops);
> +
> +	drm_edid_free(imxpd->drm_edid);
>  }
>  
>  static const struct of_device_id imx_pd_dt_ids[] = {
> -- 
> 2.39.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] drm/tiny/gm12u320: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 6/6] drm/tiny/gm12u320: " Jani Nikula
@ 2024-08-28 12:49   ` Daniel Vetter
  2024-08-28 12:52   ` Thomas Zimmermann
  1 sibling, 0 replies; 19+ messages in thread
From: Daniel Vetter @ 2024-08-28 12:49 UTC (permalink / raw)
  To: Jani Nikula
  Cc: dri-devel, Hans de Goede, Maarten Lankhorst, Maxime Ripard,
	Thomas Zimmermann

On Thu, Aug 22, 2024 at 08:42:52PM +0300, Jani Nikula wrote:
> Prefer the struct drm_edid based functions for allocating the EDID and
> updating the connector.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> 
> ---
> 
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/gpu/drm/tiny/gm12u320.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tiny/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c
> index e0defb1d134f..0bd7707c053e 100644
> --- a/drivers/gpu/drm/tiny/gm12u320.c
> +++ b/drivers/gpu/drm/tiny/gm12u320.c
> @@ -464,7 +464,7 @@ static int gm12u320_set_ecomode(struct gm12u320_device *gm12u320)
>   * Note this assumes this driver is only ever used with the Acer C120, if we
>   * add support for other devices the vendor and model should be parameterized.
>   */
> -static struct edid gm12u320_edid = {
> +static const struct edid gm12u320_edid = {
>  	.header		= { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 },
>  	.mfg_id		= { 0x04, 0x72 },	/* "ACR" */
>  	.prod_code	= { 0x20, 0xc1 },	/* C120h */
> @@ -523,8 +523,15 @@ static struct edid gm12u320_edid = {
>  
>  static int gm12u320_conn_get_modes(struct drm_connector *connector)
>  {
> -	drm_connector_update_edid_property(connector, &gm12u320_edid);
> -	return drm_add_edid_modes(connector, &gm12u320_edid);
> +	const struct drm_edid *drm_edid;
> +	int count;
> +
> +	drm_edid = drm_edid_alloc(&gm12u320_edid, sizeof(gm12u320_edid));
> +	drm_edid_connector_update(connector, drm_edid);
> +	count = drm_edid_connector_add_modes(connector);
> +	drm_edid_free(drm_edid);
> +
> +	return count;
>  }
>  
>  static const struct drm_connector_helper_funcs gm12u320_conn_helper_funcs = {
> -- 
> 2.39.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] drm/tiny/gm12u320: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 6/6] drm/tiny/gm12u320: " Jani Nikula
  2024-08-28 12:49   ` Daniel Vetter
@ 2024-08-28 12:52   ` Thomas Zimmermann
  2024-08-28 13:35     ` Jani Nikula
  1 sibling, 1 reply; 19+ messages in thread
From: Thomas Zimmermann @ 2024-08-28 12:52 UTC (permalink / raw)
  To: Jani Nikula, dri-devel; +Cc: Hans de Goede, Maarten Lankhorst, Maxime Ripard

Hi

Am 22.08.24 um 19:42 schrieb Jani Nikula:
> Prefer the struct drm_edid based functions for allocating the EDID and
> updating the connector.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: dri-devel@lists.freedesktop.org
> ---
>   drivers/gpu/drm/tiny/gm12u320.c | 13 ++++++++++---
>   1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/tiny/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c
> index e0defb1d134f..0bd7707c053e 100644
> --- a/drivers/gpu/drm/tiny/gm12u320.c
> +++ b/drivers/gpu/drm/tiny/gm12u320.c
> @@ -464,7 +464,7 @@ static int gm12u320_set_ecomode(struct gm12u320_device *gm12u320)
>    * Note this assumes this driver is only ever used with the Acer C120, if we
>    * add support for other devices the vendor and model should be parameterized.
>    */
> -static struct edid gm12u320_edid = {
> +static const struct edid gm12u320_edid = {
>   	.header		= { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 },
>   	.mfg_id		= { 0x04, 0x72 },	/* "ACR" */
>   	.prod_code	= { 0x20, 0xc1 },	/* C120h */
> @@ -523,8 +523,15 @@ static struct edid gm12u320_edid = {
>   
>   static int gm12u320_conn_get_modes(struct drm_connector *connector)
>   {
> -	drm_connector_update_edid_property(connector, &gm12u320_edid);
> -	return drm_add_edid_modes(connector, &gm12u320_edid);
> +	const struct drm_edid *drm_edid;
> +	int count;
> +
> +	drm_edid = drm_edid_alloc(&gm12u320_edid, sizeof(gm12u320_edid));

Wouldn't it be better to use drm_edid_read_custom() to get the 
connector's edid override, if any?

Best regards
Thomas

> +	drm_edid_connector_update(connector, drm_edid);
> +	count = drm_edid_connector_add_modes(connector);
> +	drm_edid_free(drm_edid);
> +
> +	return count;
>   }
>   
>   static const struct drm_connector_helper_funcs gm12u320_conn_helper_funcs = {

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 6/6] drm/tiny/gm12u320: convert to struct drm_edid
  2024-08-28 12:52   ` Thomas Zimmermann
@ 2024-08-28 13:35     ` Jani Nikula
  0 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-28 13:35 UTC (permalink / raw)
  To: Thomas Zimmermann, dri-devel
  Cc: Hans de Goede, Maarten Lankhorst, Maxime Ripard

On Wed, 28 Aug 2024, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Hi
>
> Am 22.08.24 um 19:42 schrieb Jani Nikula:
>> Prefer the struct drm_edid based functions for allocating the EDID and
>> updating the connector.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> ---
>>
>> Cc: Hans de Goede <hdegoede@redhat.com>
>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Cc: Maxime Ripard <mripard@kernel.org>
>> Cc: Thomas Zimmermann <tzimmermann@suse.de>
>> Cc: dri-devel@lists.freedesktop.org
>> ---
>>   drivers/gpu/drm/tiny/gm12u320.c | 13 ++++++++++---
>>   1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/tiny/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c
>> index e0defb1d134f..0bd7707c053e 100644
>> --- a/drivers/gpu/drm/tiny/gm12u320.c
>> +++ b/drivers/gpu/drm/tiny/gm12u320.c
>> @@ -464,7 +464,7 @@ static int gm12u320_set_ecomode(struct gm12u320_device *gm12u320)
>>    * Note this assumes this driver is only ever used with the Acer C120, if we
>>    * add support for other devices the vendor and model should be parameterized.
>>    */
>> -static struct edid gm12u320_edid = {
>> +static const struct edid gm12u320_edid = {
>>   	.header		= { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 },
>>   	.mfg_id		= { 0x04, 0x72 },	/* "ACR" */
>>   	.prod_code	= { 0x20, 0xc1 },	/* C120h */
>> @@ -523,8 +523,15 @@ static struct edid gm12u320_edid = {
>>   
>>   static int gm12u320_conn_get_modes(struct drm_connector *connector)
>>   {
>> -	drm_connector_update_edid_property(connector, &gm12u320_edid);
>> -	return drm_add_edid_modes(connector, &gm12u320_edid);
>> +	const struct drm_edid *drm_edid;
>> +	int count;
>> +
>> +	drm_edid = drm_edid_alloc(&gm12u320_edid, sizeof(gm12u320_edid));
>
> Wouldn't it be better to use drm_edid_read_custom() to get the 
> connector's edid override, if any?

It would, no doubt. But it's more work, and the conversion is more error
prone. I don't have the devices to test any of this, and I don't see
many people jumping in to help with that either.

So I'm opting for the minimum but positive incremental improvements with
the drm_edid conversions.

BR,
Jani.


>
> Best regards
> Thomas
>
>> +	drm_edid_connector_update(connector, drm_edid);
>> +	count = drm_edid_connector_add_modes(connector);
>> +	drm_edid_free(drm_edid);
>> +
>> +	return count;
>>   }
>>   
>>   static const struct drm_connector_helper_funcs gm12u320_conn_helper_funcs = {

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 4/6] drm/tegra: convert to struct drm_edid
  2024-08-22 17:42 ` [PATCH 4/6] drm/tegra: " Jani Nikula
  2024-08-28 12:46   ` Daniel Vetter
@ 2024-08-29  8:55   ` Thierry Reding
  2024-08-29 11:43     ` Jani Nikula
  1 sibling, 1 reply; 19+ messages in thread
From: Thierry Reding @ 2024-08-29  8:55 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dri-devel, Mikko Perttunen, Jonathan Hunter, linux-tegra

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

On Thu, Aug 22, 2024 at 08:42:50PM GMT, Jani Nikula wrote:
> Prefer the struct drm_edid based functions for reading the EDID and
> updating the connector.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> ---
> 
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Cc: Mikko Perttunen <mperttunen@nvidia.com>
> Cc: Jonathan Hunter <jonathanh@nvidia.com>
> Cc: linux-tegra@vger.kernel.org
> ---
>  drivers/gpu/drm/tegra/drm.h    |  2 +-
>  drivers/gpu/drm/tegra/output.c | 29 +++++++++++++++++------------
>  2 files changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
> index 682011166a8f..2f3781e04b0a 100644
> --- a/drivers/gpu/drm/tegra/drm.h
> +++ b/drivers/gpu/drm/tegra/drm.h
> @@ -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;

It perhaps might've been less confusing if this wasn't gratuitously
renamed, but either way (and assuming you want to take this through
drm-misc):

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 4/6] drm/tegra: convert to struct drm_edid
  2024-08-29  8:55   ` Thierry Reding
@ 2024-08-29 11:43     ` Jani Nikula
  0 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2024-08-29 11:43 UTC (permalink / raw)
  To: Thierry Reding; +Cc: dri-devel, Mikko Perttunen, Jonathan Hunter, linux-tegra

On Thu, 29 Aug 2024, Thierry Reding <thierry.reding@gmail.com> wrote:
> On Thu, Aug 22, 2024 at 08:42:50PM GMT, Jani Nikula wrote:
>> Prefer the struct drm_edid based functions for reading the EDID and
>> updating the connector.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> 
>> ---
>> 
>> Cc: Thierry Reding <thierry.reding@gmail.com>
>> Cc: Mikko Perttunen <mperttunen@nvidia.com>
>> Cc: Jonathan Hunter <jonathanh@nvidia.com>
>> Cc: linux-tegra@vger.kernel.org
>> ---
>>  drivers/gpu/drm/tegra/drm.h    |  2 +-
>>  drivers/gpu/drm/tegra/output.c | 29 +++++++++++++++++------------
>>  2 files changed, 18 insertions(+), 13 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
>> index 682011166a8f..2f3781e04b0a 100644
>> --- a/drivers/gpu/drm/tegra/drm.h
>> +++ b/drivers/gpu/drm/tegra/drm.h
>> @@ -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;
>
> It perhaps might've been less confusing if this wasn't gratuitously
> renamed, but either way (and assuming you want to take this through
> drm-misc):

I've been doing that to ensure all call sites, especially kfree(), get
changed.

> Acked-by: Thierry Reding <treding@nvidia.com>

Thanks, pushed to drm-misc-next.

BR,
Jani.


-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH 0/6] drm: conversions to struct drm_edid
  2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
                   ` (5 preceding siblings ...)
  2024-08-22 17:42 ` [PATCH 6/6] drm/tiny/gm12u320: " Jani Nikula
@ 2024-08-29 11:44 ` Jani Nikula
  2024-09-04  2:21   ` 대인기/Tizen Platform Lab(SR)/삼성전자
  6 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2024-08-29 11:44 UTC (permalink / raw)
  To: dri-devel; +Cc: Daniel Vetter, inki.dae

On Thu, 22 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> The umerged patches from [1] and then some.
>
> BR,
> Jani.
>
> [1] https://lore.kernel.org/r/cover.1715691257.git.jani.nikula@intel.com
>
> Jani Nikula (6):
>   drm/sti/sti_hdmi: convert to struct drm_edid
>   drm/tegra: convert to struct drm_edid
>   drm/ipuv3/parallel: convert to struct drm_edid
>   drm/tiny/gm12u320: convert to struct drm_edid

Pushed the above to drm-misc-next, thanks for the reviews and acks.

>   drm/exynos: hdmi: use display_info for printing display dimensions
>   drm/exynos: hdmi: convert to struct drm_edid

I'll wait for Inki to check these.

BR,
Jani.

>
>  drivers/gpu/drm/exynos/exynos_hdmi.c         | 25 ++++++++++-------
>  drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 ++++++----
>  drivers/gpu/drm/sti/sti_hdmi.c               | 24 +++++++++-------
>  drivers/gpu/drm/tegra/drm.h                  |  2 +-
>  drivers/gpu/drm/tegra/output.c               | 29 ++++++++++++--------
>  drivers/gpu/drm/tiny/gm12u320.c              | 13 +++++++--
>  6 files changed, 66 insertions(+), 41 deletions(-)

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* RE: [PATCH 0/6] drm: conversions to struct drm_edid
  2024-08-29 11:44 ` [PATCH 0/6] drm: conversions " Jani Nikula
@ 2024-09-04  2:21   ` 대인기/Tizen Platform Lab(SR)/삼성전자
  2024-09-04  8:32     ` Jani Nikula
  0 siblings, 1 reply; 19+ messages in thread
From: 대인기/Tizen Platform Lab(SR)/삼성전자 @ 2024-09-04  2:21 UTC (permalink / raw)
  To: 'Jani Nikula', dri-devel; +Cc: 'Daniel Vetter'

Hi Jani,

Sorry for being late.


> -----Original Message-----
> From: Jani Nikula <jani.nikula@intel.com>
> Sent: Thursday, August 29, 2024 8:45 PM
> To: dri-devel@lists.freedesktop.org
> Cc: Daniel Vetter <daniel.vetter@intel.com>; inki.dae@samsung.com
> Subject: Re: [PATCH 0/6] drm: conversions to struct drm_edid
> 
> On Thu, 22 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> > The umerged patches from [1] and then some.
> >
> > BR,
> > Jani.
> >
> > [1] https://lore.kernel.org/r/cover.1715691257.git.jani.nikula@intel.com
> >
> > Jani Nikula (6):
> >   drm/sti/sti_hdmi: convert to struct drm_edid
> >   drm/tegra: convert to struct drm_edid
> >   drm/ipuv3/parallel: convert to struct drm_edid
> >   drm/tiny/gm12u320: convert to struct drm_edid
> 
> Pushed the above to drm-misc-next, thanks for the reviews and acks.
> 
> >   drm/exynos: hdmi: use display_info for printing display dimensions
> >   drm/exynos: hdmi: convert to struct drm_edid
> 
> I'll wait for Inki to check these.

You could push them to drm-misc-next.

Acked-by : Inki Dae <inki.dae@samsung.com>

Thanks,
Inki Dae

> 
> BR,
> Jani.
> 
> >
> >  drivers/gpu/drm/exynos/exynos_hdmi.c         | 25 ++++++++++-------
> >  drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 ++++++----
> >  drivers/gpu/drm/sti/sti_hdmi.c               | 24 +++++++++-------
> >  drivers/gpu/drm/tegra/drm.h                  |  2 +-
> >  drivers/gpu/drm/tegra/output.c               | 29 ++++++++++++--------
> >  drivers/gpu/drm/tiny/gm12u320.c              | 13 +++++++--
> >  6 files changed, 66 insertions(+), 41 deletions(-)
> 
> --
> Jani Nikula, Intel


^ permalink raw reply	[flat|nested] 19+ messages in thread

* RE: [PATCH 0/6] drm: conversions to struct drm_edid
  2024-09-04  2:21   ` 대인기/Tizen Platform Lab(SR)/삼성전자
@ 2024-09-04  8:32     ` Jani Nikula
  0 siblings, 0 replies; 19+ messages in thread
From: Jani Nikula @ 2024-09-04  8:32 UTC (permalink / raw)
  To: 대인기/Tizen Platform Lab(SR)/삼성전자,
	dri-devel
  Cc: 'Daniel Vetter'

On Wed, 04 Sep 2024, 대인기/Tizen Platform Lab(SR)/삼성전자	<inki.dae@samsung.com> wrote:
>> >   drm/exynos: hdmi: use display_info for printing display dimensions
>> >   drm/exynos: hdmi: convert to struct drm_edid
>> 
>> I'll wait for Inki to check these.
>
> You could push them to drm-misc-next.
>
> Acked-by : Inki Dae <inki.dae@samsung.com>

Thanks, pushed.

BR,
Jani.


-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2024-09-04  8:33 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-22 17:42 [PATCH 0/6] drm: conversions to struct drm_edid Jani Nikula
2024-08-22 17:42 ` [PATCH 1/6] drm/sti/sti_hdmi: convert " Jani Nikula
2024-08-22 17:42 ` [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions Jani Nikula
2024-08-28 12:44   ` Daniel Vetter
2024-08-22 17:42 ` [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid Jani Nikula
2024-08-28 12:45   ` Daniel Vetter
2024-08-22 17:42 ` [PATCH 4/6] drm/tegra: " Jani Nikula
2024-08-28 12:46   ` Daniel Vetter
2024-08-29  8:55   ` Thierry Reding
2024-08-29 11:43     ` Jani Nikula
2024-08-22 17:42 ` [PATCH 5/6] drm/ipuv3/parallel: " Jani Nikula
2024-08-28 12:48   ` Daniel Vetter
2024-08-22 17:42 ` [PATCH 6/6] drm/tiny/gm12u320: " Jani Nikula
2024-08-28 12:49   ` Daniel Vetter
2024-08-28 12:52   ` Thomas Zimmermann
2024-08-28 13:35     ` Jani Nikula
2024-08-29 11:44 ` [PATCH 0/6] drm: conversions " Jani Nikula
2024-09-04  2:21   ` 대인기/Tizen Platform Lab(SR)/삼성전자
2024-09-04  8:32     ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).