github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/imx: ldb: drop custom EDID support

Browse Source 
Bindings for the imx-ldb never allowed specifying the EDID in DT. None
of the existing DT files use it. Drop it now in favour of using debugfs
overrides or the drm.edid_firmware support.

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Chris Healy <cphealy@gmail.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de> # on imx6q-nitrogen6x
Link: https://patchwork.freedesktop.org/patch/msgid/20240602-drm-imx-cleanup-v3-5-e549e2a43100@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
Dmitry Baryshkov 2024-06-02 15:04:45 +03:00
parent fe30fabf22
commit aed7b50031
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/imx/ipuv3/imx-ldb.c
View File

@ -72,7 +72,6 @@ struct imx_ldb_channel {
struct device_node *child;
struct i2c_adapter *ddc;
int chno;
const struct drm_edid *drm_edid;
struct drm_display_mode mode;
int mode_valid;
u32 bus_format;
@ -142,14 +141,17 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
if (num_modes > 0)
return num_modes;
if (!imx_ldb_ch->drm_edid && imx_ldb_ch->ddc) {
imx_ldb_ch->drm_edid = drm_edid_read_ddc(connector,
imx_ldb_ch->ddc);
drm_edid_connector_update(connector, imx_ldb_ch->drm_edid);
}
if (imx_ldb_ch->ddc) {
const struct drm_edid *edid = drm_edid_read_ddc(connector,
imx_ldb_ch->ddc);
if (imx_ldb_ch->drm_edid)
num_modes = drm_edid_connector_add_modes(connector);
if (edid) {
drm_edid_connector_update(connector, edid);
drm_edid_free(edid);
return drm_edid_connector_add_modes(connector);
}
}
if (imx_ldb_ch->mode_valid) {
struct drm_display_mode *mode;
@ -566,18 +568,10 @@ static int imx_ldb_panel_ddc(struct device *dev,
}
if (!channel->ddc) {
const void *edidp;
int edid_len;
/* if no DDC available, fallback to hardcoded EDID */
dev_dbg(dev, "no ddc available\n");
edidp = of_get_property(child, "edid", &edid_len);
if (edidp) {
channel->drm_edid = drm_edid_alloc(edidp, edid_len);
if (!channel->drm_edid)
return -ENOMEM;
} else if (!channel->panel) {
if (!channel->panel) {
/* fallback to display-timings node */
ret = of_get_drm_display_mode(child,
&channel->mode,
@ -744,7 +738,6 @@ static void imx_ldb_remove(struct platform_device *pdev)
for (i = 0; i < 2; i++) {
struct imx_ldb_channel *channel = &imx_ldb->channel[i];
drm_edid_free(channel->drm_edid);
i2c_put_adapter(channel->ddc);
}