diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-03-06 02:51:31 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:28 +0300 |
| commit | 3be0f15bd6e94aa17a571020704bde413342e8eb (patch) | |
| tree | d27d8aa2349085f57af46620dda266f386dba2f6 /drivers/gpu/drm/omapdrm/dss/hdmi5.c | |
| parent | 713165561b7e372cd21f34bfeb82188361569f74 (diff) | |
| download | linux-3be0f15bd6e94aa17a571020704bde413342e8eb.tar.xz | |
drm/omap: dss: Merge two disconnection helpers
To simplify the pipeline disconnection handling merge the
omapdss_device_disconnect() and omapdss_output_unset_device() functions.
The device state check is now called for every device in the pipeline,
extending this sanity check coverage.
There is no need to return an error from omapdss_device_disconnect()
when the check fails, as omapdss_output_unset_device() used to do, given
that we can't prevent disconnection due to device unbinding (the return
value of omapdss_output_unset_device() is never checked in the current
code for that reason).
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>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi5.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index d8592d02a58d..f7e15edc05fc 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -455,7 +455,6 @@ static void hdmi_disconnect(struct omap_dss_device *src, struct omap_dss_device *dst) { omapdss_device_disconnect(dst, dst->next); - omapdss_output_unset_device(dst); dss_mgr_disconnect(dst); } |