diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-19 16:09:34 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-06-17 15:00:51 +0400 |
| commit | 1f68d9c4b660487c5878c4800ff5a402abc6c005 (patch) | |
| tree | 1309d1567c05c201739d93db178736d012a48eb2 /drivers/gpu/drm/omapdrm | |
| parent | d3923933930273a2c1f724c50fe1dd829e196b31 (diff) | |
| download | linux-1f68d9c4b660487c5878c4800ff5a402abc6c005.tar.xz | |
OMAPDSS: combine omap_dss_output into omap_dss_device
We currently have omap_dss_device, which represents an external display
device, sometimes an external encoder, sometimes a panel. Then we have
omap_dss_output, which represents DSS's output encoder.
In the future with new display device model, we construct a video
pipeline from the display blocks. To accomplish this, all the blocks
need to be presented by the same entity.
Thus, this patch combines omap_dss_output into omap_dss_device. Some of
the fields in omap_dss_output are already found in omap_dss_device, but
some are not. This means we'll have DSS output specific fields in
omap_dss_device, which is not very nice. However, it is easier to just
keep those output specific fields there for now, and after transition to
new display device model is made, they can be cleaned up easier than
could be done now.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index b2ab2f5d3cb9..4cec678dba94 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -95,7 +95,7 @@ static struct omap_crtc *omap_crtcs[8]; /* we can probably ignore these until we support command-mode panels: */ static int omap_crtc_connect(struct omap_overlay_manager *mgr, - struct omap_dss_output *dst) + struct omap_dss_device *dst) { if (mgr->output) return -EINVAL; @@ -110,7 +110,7 @@ static int omap_crtc_connect(struct omap_overlay_manager *mgr, } static void omap_crtc_disconnect(struct omap_overlay_manager *mgr, - struct omap_dss_output *dst) + struct omap_dss_device *dst) { mgr->output->manager = NULL; mgr->output = NULL; diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index c65dd0d6b01d..78a78c6ea576 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -259,7 +259,7 @@ static int omap_modeset_init(struct drm_device *dev) struct drm_encoder *encoder = priv->encoders[i]; struct omap_dss_device *dssdev = omap_encoder_get_dssdev(encoder); - struct omap_dss_output *output; + struct omap_dss_device *output; output = omapdss_find_output_from_display(dssdev); |