diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-05 09:34:31 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 17:38:22 +0200 |
| commit | 49239503a364bf09845d03536b28ea434b92184d (patch) | |
| tree | 968c24c81c72d07d689821ddbecb57b00477d2a3 | |
| parent | e5cbb6e8eaa6d4ae8b4acafd59e2e058105c8177 (diff) | |
| download | linux-49239503a364bf09845d03536b28ea434b92184d.tar.bz2 | |
drm/omap: add dispc_channel_connected field to omap_dss_device
We want to remove the 'struct omap_overlay_manager' from
omap_dss_device. At the moment that field is used, among some other
uses, to see if the omap_dss_device is connected to an overlay manager.
To make it possible to remove the 'struct omap_overlay_manager' field,
this patch adds 'bool dispc_channel_connected' field to track the
connected-or-not status.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 2 | ||||
| -rw-r--r-- | include/video/omapdss.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index cb5a30e3109d..3667ff1d8474 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -111,6 +111,7 @@ static int omap_crtc_dss_connect(enum omap_channel channel, return -EINVAL; omap_crtc_output[channel] = dst; + dst->dispc_channel_connected = true; dst->manager = mgr; mgr->output = dst; @@ -124,6 +125,7 @@ static void omap_crtc_dss_disconnect(enum omap_channel channel, struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); omap_crtc_output[channel] = NULL; + dst->dispc_channel_connected = false; mgr->output->manager = NULL; mgr->output = NULL; diff --git a/include/video/omapdss.h b/include/video/omapdss.h index b50ebcd2f460..8e14ad7327c9 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -770,6 +770,7 @@ struct omap_dss_device { /* DISPC channel for this output */ enum omap_channel dispc_channel; + bool dispc_channel_connected; /* output instance */ enum omap_dss_output_id id; |