diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-26 16:46:29 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-26 16:46:29 +0300 |
| commit | 866f0956cba7d28432f20f8a696e5c1a2b40b915 (patch) | |
| tree | 87b1d203cef69785448a7b07611314c2a203ae23 /drivers/video/omap2/omapfb/omapfb-main.c | |
| parent | e84dc1cc1503150e3bc37268a0b0f0bc0097622c (diff) | |
| parent | 3c2995ac34eb559106504be962b162aef215895b (diff) | |
Merge branch 'archit/outputs-for-3.7'
Merge omapdss output work, that creates a new entity "output" to represent the
outputs (DPI, DSI, HDMI, ...) from DSS. An output sits in between an overlay
manager and a panel, and helps us to remove references to panel devices from
the omapdss core.
* archit/outputs-for-3.7: (23 commits)
OMAPDSS: Remove old way of setting manager and device links
OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable
OMAPDSS: OVERLAY/MANAGER: Get device via output
OMAPDSS: MANAGER: Update display sysfs store
OMAPFB: Change dssdev->manager references
OMAPDSS: HDMI: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: VENC: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: RFBI: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: SDI: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: DSI: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: DSI: Remove dsi_pdev_map global struct
OMAPDSS: DPI: Replace dssdev->manager with dssdev->output->manager references
OMAPDSS: Create links between managers, outputs and devices
OMAPDRM: Remove manager->device references
OMAPFB: remove manager->device references
OMAP_VOUT: Remove manager->device references
OMAPDSS: Remove manager->device references
OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager
OMAPDSS: output: Add set/unset device ops for omap_dss_output
OMAPDSS: outputs: Create and register output instances
...
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 77ae9edbf2cd..b103793516db 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2379,6 +2379,7 @@ static int __init omapfb_probe(struct platform_device *pdev) struct omap_overlay *ovl; struct omap_dss_device *def_display; struct omap_dss_device *dssdev; + struct omap_dss_device *ovl_device; DBG("omapfb_probe\n"); @@ -2452,8 +2453,9 @@ static int __init omapfb_probe(struct platform_device *pdev) /* gfx overlay should be the default one. find a display * connected to that, and use it as default display */ ovl = omap_dss_get_overlay(0); - if (ovl->manager && ovl->manager->device) { - def_display = ovl->manager->device; + ovl_device = ovl->get_device(ovl); + if (ovl_device) { + def_display = ovl_device; } else { dev_warn(&pdev->dev, "cannot find default display\n"); def_display = NULL; |