The drm_panel_attach/detach() functions are empty since commit aa6c43644bc5 ("drm/panel: drop drm_device from drm_panel"), remove them.
Signed-off-by: Philipp Zabel p.zabel@pengutronix.de --- drivers/gpu/drm/imx/imx-ldb.c | 10 ---------- drivers/gpu/drm/imx/parallel-display.c | 6 ------ 2 files changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 8791d60be92e..af757d1e21fe 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm, drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder); }
- if (imx_ldb_ch->panel) { - ret = drm_panel_attach(imx_ldb_ch->panel, - &imx_ldb_ch->connector); - if (ret) - return ret; - } - return 0; }
@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, for (i = 0; i < 2; i++) { struct imx_ldb_channel *channel = &imx_ldb->channel[i];
- if (channel->panel) - drm_panel_detach(channel->panel); - kfree(channel->edid); i2c_put_adapter(channel->ddc); } diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index a831b5bd1613..8232f512b9ed 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); }
- if (imxpd->panel) - drm_panel_attach(imxpd->panel, &imxpd->connector); - if (imxpd->next_bridge) { ret = drm_bridge_attach(encoder, imxpd->next_bridge, &imxpd->bridge, 0); @@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, { struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
- if (imxpd->panel) - drm_panel_detach(imxpd->panel); - kfree(imxpd->edid); }
Hi Philipp.
On Tue, Jul 21, 2020 at 03:06:50PM +0200, Philipp Zabel wrote:
The drm_panel_attach/detach() functions are empty since commit aa6c43644bc5 ("drm/panel: drop drm_device from drm_panel"), remove them.
Signed-off-by: Philipp Zabel p.zabel@pengutronix.de
We ended up removing them all in one go. So they are now gone in drm-misc-next and you can skip this patch.
Sam
drivers/gpu/drm/imx/imx-ldb.c | 10 ---------- drivers/gpu/drm/imx/parallel-display.c | 6 ------ 2 files changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 8791d60be92e..af757d1e21fe 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm, drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder); }
- if (imx_ldb_ch->panel) {
ret = drm_panel_attach(imx_ldb_ch->panel,
&imx_ldb_ch->connector);
if (ret)
return ret;
- }
- return 0;
}
@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, for (i = 0; i < 2; i++) { struct imx_ldb_channel *channel = &imx_ldb->channel[i];
if (channel->panel)
drm_panel_detach(channel->panel);
- kfree(channel->edid); i2c_put_adapter(channel->ddc); }
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index a831b5bd1613..8232f512b9ed 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); }
- if (imxpd->panel)
drm_panel_attach(imxpd->panel, &imxpd->connector);
- if (imxpd->next_bridge) { ret = drm_bridge_attach(encoder, imxpd->next_bridge, &imxpd->bridge, 0);
@@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, { struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
- if (imxpd->panel)
drm_panel_detach(imxpd->panel);
- kfree(imxpd->edid);
}
-- 2.20.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Sam,
On Mon, Aug 10, 2020 at 07:56:39PM +0200, Sam Ravnborg wrote:
Hi Philipp.
On Tue, Jul 21, 2020 at 03:06:50PM +0200, Philipp Zabel wrote:
The drm_panel_attach/detach() functions are empty since commit aa6c43644bc5 ("drm/panel: drop drm_device from drm_panel"), remove them.
Signed-off-by: Philipp Zabel p.zabel@pengutronix.de
We ended up removing them all in one go. So they are now gone in drm-misc-next and you can skip this patch.
Excellent, thank you!
regards Philipp
dri-devel@lists.freedesktop.org