drm/omap: Remove connection checks from internal encoders .enable()
The internal encoders return an error from their .enable() handler when their are not connected to a dss manager. As the flag used is set and cleared in the connect and disconnect handlers, this effectively checks whether the omap_dss_device is connected. The .enable() handler is called from code paths that access the dss devices chain from the display device, which is set to NULL when the device isn't connected, making it impossible to access the device in that case. The safety check is thus not needed, remove it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:

committed by
Tomi Valkeinen

parent
b80bfc66b0
commit
f8a8eabb27
@@ -531,12 +531,6 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
|
||||
|
||||
mutex_lock(&venc->venc_lock);
|
||||
|
||||
if (!dssdev->dispc_channel_connected) {
|
||||
DSSERR("Failed to enable display: no output/manager\n");
|
||||
r = -ENODEV;
|
||||
goto err0;
|
||||
}
|
||||
|
||||
r = venc_power_on(venc);
|
||||
if (r)
|
||||
goto err0;
|
||||
@@ -687,21 +681,12 @@ static int venc_get_clocks(struct venc_device *venc)
|
||||
static int venc_connect(struct omap_dss_device *src,
|
||||
struct omap_dss_device *dst)
|
||||
{
|
||||
int r;
|
||||
|
||||
r = omapdss_device_connect(dst->dss, dst, dst->next);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
dst->dispc_channel_connected = true;
|
||||
return 0;
|
||||
return omapdss_device_connect(dst->dss, dst, dst->next);
|
||||
}
|
||||
|
||||
static void venc_disconnect(struct omap_dss_device *src,
|
||||
struct omap_dss_device *dst)
|
||||
{
|
||||
dst->dispc_channel_connected = false;
|
||||
|
||||
omapdss_device_disconnect(dst, dst->next);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user