xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/omap: Reverse direction of DSS device (dis)connect operations

Browse Source 
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:
Laurent Pinchart
2018-03-04 23:42:36 +02:00
committed by Tomi Valkeinen
parent 2ee767922e
commit 511afb44d7
24 changed files with 239 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@@ -691,32 +691,42 @@ static int venc_get_clocks(struct venc_device *venc)
return 0;
}
static int venc_connect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
static int venc_connect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
int r;
r = dss_mgr_connect(dssdev);
r = dss_mgr_connect(dst);
if (r)
return r;
r = omapdss_output_set_device(dssdev, dst);
r = omapdss_output_set_device(dst, dst->next);
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
dss_mgr_disconnect(dssdev);
return r;
goto err_mgr_disconnect;
}
r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r)
goto err_output_unset;
return 0;
err_output_unset:
omapdss_output_unset_device(dst);
err_mgr_disconnect:
dss_mgr_disconnect(dst);
return r;
}
static void venc_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
static void venc_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
omapdss_output_unset_device(dssdev);
omapdss_device_disconnect(dst, dst->next);
omapdss_output_unset_device(dst);
dss_mgr_disconnect(dssdev);
dss_mgr_disconnect(dst);
}
static const struct omap_dss_device_ops venc_ops = {