Skip to content

Commit fe30fab

Browse files
committed
drm/imx: parallel-display: drop edid override support
None of the in-kernel DT files ever used edid override with the fsl-imx-drm driver. In case the EDID needs to be specified manually, DRM core allows one to either override it via the debugfs or to load it via request_firmware by using DRM_LOAD_EDID_FIRMWARE. In all other cases EDID and/or modes are to be provided as a part of the panel driver. Drop support for the edid property. Reviewed-by: Philipp Zabel <[email protected]> Acked-by: Rob Herring <[email protected]> Tested-by: Chris Healy <[email protected]> Tested-by: Philipp Zabel <[email protected]> # on imx6q-nitrogen6x Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent cc3fcd8 commit fe30fab

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include <drm/drm_atomic_helper.h>
1818
#include <drm/drm_bridge.h>
19-
#include <drm/drm_edid.h>
2019
#include <drm/drm_managed.h>
2120
#include <drm/drm_of.h>
2221
#include <drm/drm_panel.h>
@@ -34,7 +33,6 @@ struct imx_parallel_display_encoder {
3433

3534
struct imx_parallel_display {
3635
struct device *dev;
37-
const struct drm_edid *drm_edid;
3836
u32 bus_format;
3937
u32 bus_flags;
4038
struct drm_display_mode mode;
@@ -62,11 +60,6 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
6260
if (num_modes > 0)
6361
return num_modes;
6462

65-
if (imxpd->drm_edid) {
66-
drm_edid_connector_update(connector, imxpd->drm_edid);
67-
num_modes = drm_edid_connector_add_modes(connector);
68-
}
69-
7063
if (np) {
7164
struct drm_display_mode *mode = drm_mode_create(connector->dev);
7265
int ret;
@@ -312,9 +305,7 @@ static int imx_pd_probe(struct platform_device *pdev)
312305
{
313306
struct device *dev = &pdev->dev;
314307
struct device_node *np = dev->of_node;
315-
const u8 *edidp;
316308
struct imx_parallel_display *imxpd;
317-
int edid_len;
318309
int ret;
319310
u32 bus_format = 0;
320311
const char *fmt;
@@ -329,10 +320,6 @@ static int imx_pd_probe(struct platform_device *pdev)
329320
if (ret && ret != -ENODEV)
330321
return ret;
331322

332-
edidp = of_get_property(np, "edid", &edid_len);
333-
if (edidp)
334-
imxpd->drm_edid = drm_edid_alloc(edidp, edid_len);
335-
336323
ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
337324
if (!ret) {
338325
if (!strcmp(fmt, "rgb24"))
@@ -355,11 +342,7 @@ static int imx_pd_probe(struct platform_device *pdev)
355342

356343
static void imx_pd_remove(struct platform_device *pdev)
357344
{
358-
struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
359-
360345
component_del(&pdev->dev, &imx_pd_ops);
361-
362-
drm_edid_free(imxpd->drm_edid);
363346
}
364347

365348
static const struct of_device_id imx_pd_dt_ids[] = {

0 commit comments

Comments
 (0)