* [PATCH 2/6] drm/exynos: hdmi: use display_info for printing display dimensions
[not found] <cover.1724348429.git.jani.nikula@intel.com>
@ 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
2024-08-22 17:42 ` [PATCH 5/6] drm/ipuv3/parallel: " Jani Nikula
2 siblings, 1 reply; 6+ 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] 6+ 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; 6+ 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] 6+ messages in thread
* [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid
[not found] <cover.1724348429.git.jani.nikula@intel.com>
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 5/6] drm/ipuv3/parallel: " Jani Nikula
2 siblings, 1 reply; 6+ 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] 6+ 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; 6+ 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] 6+ messages in thread
* [PATCH 5/6] drm/ipuv3/parallel: convert to struct drm_edid
[not found] <cover.1724348429.git.jani.nikula@intel.com>
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 ` [PATCH 3/6] drm/exynos: hdmi: convert to struct drm_edid Jani Nikula
@ 2024-08-22 17:42 ` Jani Nikula
2024-08-28 12:48 ` Daniel Vetter
2 siblings, 1 reply; 6+ 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] 6+ 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; 6+ 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] 6+ messages in thread