diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-12 07:16:41 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 07:31:28 -0500 |
commit | 18946f62c6cc8cf051bafca8b7fa72309e8a1067 (patch) | |
tree | f1e33d76a571ebc4580b15c1b7ba1bec8e441cf6 /drivers/video/omap2/omapfb/omapfb-main.c | |
parent | 446f7bff703f5f82560afde90fb22b7a1d366bbc (diff) |
OMAP: DSS2: move update() and sync()
Move update() and sync() from omap_dss_device to omap_dss_driver.
Also, update was hardcoded to use virtual channel 0. This patch adds a
parameter that specifies the VC.
This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
-rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index c720842341b2..3dbbddc2d51e 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
@@ -1254,11 +1254,11 @@ static int omapfb_blank(int blank, struct fb_info *fbi) | |||
1254 | exit: | 1254 | exit: |
1255 | omapfb_unlock(fbdev); | 1255 | omapfb_unlock(fbdev); |
1256 | 1256 | ||
1257 | if (r == 0 && do_update && display->update) { | 1257 | if (r == 0 && do_update && display->driver->update) { |
1258 | u16 w, h; | 1258 | u16 w, h; |
1259 | display->driver->get_resolution(display, &w, &h); | 1259 | display->driver->get_resolution(display, &w, &h); |
1260 | 1260 | ||
1261 | r = display->update(display, 0, 0, w, h); | 1261 | r = display->driver->update(display, 0, 0, w, h); |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | return r; | 1264 | return r; |
@@ -1639,8 +1639,8 @@ int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type) | |||
1639 | if (old_size == size && old_type == type) | 1639 | if (old_size == size && old_type == type) |
1640 | return 0; | 1640 | return 0; |
1641 | 1641 | ||
1642 | if (display && display->sync) | 1642 | if (display && display->driver->sync) |
1643 | display->sync(display); | 1643 | display->driver->sync(display); |
1644 | 1644 | ||
1645 | omapfb_free_fbmem(fbi); | 1645 | omapfb_free_fbmem(fbi); |
1646 | 1646 | ||
@@ -2221,7 +2221,7 @@ static int omapfb_probe(struct platform_device *pdev) | |||
2221 | 2221 | ||
2222 | dssdrv->get_resolution(def_display, | 2222 | dssdrv->get_resolution(def_display, |
2223 | &w, &h); | 2223 | &w, &h); |
2224 | def_display->update(def_display, 0, 0, w, h); | 2224 | def_display->driver->update(def_display, 0, 0, w, h); |
2225 | #endif | 2225 | #endif |
2226 | } else { | 2226 | } else { |
2227 | if (dssdrv->set_update_mode) | 2227 | if (dssdrv->set_update_mode) |