Skip to content

Commit 42e0828

Browse files
committed
drm/ipuv3/parallel: convert to struct drm_edid
Prefer the struct drm_edid based functions for storing the EDID and updating the connector. Reviewed-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/a1698044d556072e79041d69b8702099fd17bd90.1724348429.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 98365ca commit 42e0828

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

drivers/gpu/drm/imx/ipuv3/parallel-display.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct imx_parallel_display_encoder {
3434

3535
struct imx_parallel_display {
3636
struct device *dev;
37-
void *edid;
37+
const struct drm_edid *drm_edid;
3838
u32 bus_format;
3939
u32 bus_flags;
4040
struct drm_display_mode mode;
@@ -62,9 +62,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
6262
if (num_modes > 0)
6363
return num_modes;
6464

65-
if (imxpd->edid) {
66-
drm_connector_update_edid_property(connector, imxpd->edid);
67-
num_modes = drm_add_edid_modes(connector, imxpd->edid);
65+
if (imxpd->drm_edid) {
66+
drm_edid_connector_update(connector, imxpd->drm_edid);
67+
num_modes = drm_edid_connector_add_modes(connector);
6868
}
6969

7070
if (np) {
@@ -331,7 +331,7 @@ static int imx_pd_probe(struct platform_device *pdev)
331331

332332
edidp = of_get_property(np, "edid", &edid_len);
333333
if (edidp)
334-
imxpd->edid = devm_kmemdup(dev, edidp, edid_len, GFP_KERNEL);
334+
imxpd->drm_edid = drm_edid_alloc(edidp, edid_len);
335335

336336
ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
337337
if (!ret) {
@@ -355,7 +355,11 @@ static int imx_pd_probe(struct platform_device *pdev)
355355

356356
static void imx_pd_remove(struct platform_device *pdev)
357357
{
358+
struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
359+
358360
component_del(&pdev->dev, &imx_pd_ops);
361+
362+
drm_edid_free(imxpd->drm_edid);
359363
}
360364

361365
static const struct of_device_id imx_pd_dt_ids[] = {

0 commit comments

Comments
 (0)