drm/omap: Reverse direction of DSS device (dis)connect operations
The omapdrm and omapdss drivers are architectured based on display pipelines made of multiple components handled from sink (display) to source (DSS output). This is incompatible with the DRM bridge and panel APIs that handle components from source to sink. To reconcile the omapdrm and omapdss drivers with the DRM bridge and panel model, we need to reverse the direction of the DSS device operations. Start with the connect and disconnect operations. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:

committed by
Tomi Valkeinen

parent
2ee767922e
commit
511afb44d7
@@ -27,36 +27,16 @@ struct panel_drv_data {
|
||||
|
||||
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
|
||||
|
||||
static int tfp410_connect(struct omap_dss_device *dssdev,
|
||||
struct omap_dss_device *dst)
|
||||
static int tfp410_connect(struct omap_dss_device *src,
|
||||
struct omap_dss_device *dst)
|
||||
{
|
||||
struct omap_dss_device *src;
|
||||
int r;
|
||||
|
||||
src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
|
||||
if (IS_ERR(src)) {
|
||||
dev_err(dssdev->dev, "failed to find video source\n");
|
||||
return PTR_ERR(src);
|
||||
}
|
||||
|
||||
r = omapdss_device_connect(dssdev->dss, src, dssdev);
|
||||
if (r) {
|
||||
omapdss_device_put(src);
|
||||
return r;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return omapdss_device_connect(dst->dss, dst, dst->next);
|
||||
}
|
||||
|
||||
static void tfp410_disconnect(struct omap_dss_device *dssdev,
|
||||
struct omap_dss_device *dst)
|
||||
static void tfp410_disconnect(struct omap_dss_device *src,
|
||||
struct omap_dss_device *dst)
|
||||
{
|
||||
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
||||
struct omap_dss_device *src = dssdev->src;
|
||||
|
||||
omapdss_device_disconnect(src, &ddata->dssdev);
|
||||
|
||||
omapdss_device_put(src);
|
||||
omapdss_device_disconnect(dst, dst->next);
|
||||
}
|
||||
|
||||
static int tfp410_enable(struct omap_dss_device *dssdev)
|
||||
@@ -219,7 +199,7 @@ static int __exit tfp410_remove(struct platform_device *pdev)
|
||||
|
||||
WARN_ON(omapdss_device_is_connected(dssdev));
|
||||
if (omapdss_device_is_connected(dssdev))
|
||||
omapdss_device_disconnect(dssdev, dssdev->dst);
|
||||
omapdss_device_disconnect(NULL, dssdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user