mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

drm/omap: Set dispc_channel_connect from DSS output connect handlers

Browse source 
The omap_dss_device.dispc_channel_connect field is used by DSS outputs
to fail the .enable() operation if they're not connected. Set the field
directly from the (dis)connect handlers of the DSS outputs instead of
going through the CRTC dss_mgr operations.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2018-03-07 00:28:18 +02:00 committed by Tomi Valkeinen
parent d25a7d6746
commit 0f37938c7c
7 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/omapdrm/dss/dpi.c
View file

@ -626,12 +626,15 @@ static int dpi_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
static void dpi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/dss/dsi.c
View file

@ -4896,12 +4896,15 @@ static int dsi_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
static void dsi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View file

@ -443,12 +443,15 @@ static int hdmi_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View file

@ -448,12 +448,15 @@ static int hdmi_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/dss/sdi.c
View file

@ -267,12 +267,15 @@ static int sdi_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
static void sdi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/dss/venc.c
View file

@ -706,12 +706,15 @@ static int venc_connect(struct omap_dss_device *src,
return r;
}
dst->dispc_channel_connected = true;
return 0;
}
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);
dss_mgr_disconnect(dst);

3
drivers/gpu/drm/omapdrm/omap_crtc.c
View file

@ -114,8 +114,6 @@ static int omap_crtc_dss_connect(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = true;
return 0;
}
@ -123,7 +121,6 @@ static void omap_crtc_dss_disconnect(struct omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst)
{
dst->dispc_channel_connected = false;
}
static void omap_crtc_dss_start_update(struct omap_drm_private *priv,