diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-20 05:11:25 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 07:31:28 -0500 |
commit | 69b2048f44ead2d278e25d12adf0494b469ffb1c (patch) | |
tree | 3f2b462aa04ecd131d2fb4936e61c59a75a5a50c /drivers/video/omap2/omapfb | |
parent | 3651131268d7eae63efdffe6fa4a361abd44d747 (diff) |
OMAP: DSS2: move timing functions
Move check/set/get_timings() from omap_dss_device to omap_dss_driver.
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')
-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 b327ee0e60d5..8aed12a1ce2f 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
@@ -705,9 +705,9 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) | |||
705 | var->width = -1; | 705 | var->width = -1; |
706 | var->grayscale = 0; | 706 | var->grayscale = 0; |
707 | 707 | ||
708 | if (display && display->get_timings) { | 708 | if (display && display->driver->get_timings) { |
709 | struct omap_video_timings timings; | 709 | struct omap_video_timings timings; |
710 | display->get_timings(display, &timings); | 710 | display->driver->get_timings(display, &timings); |
711 | 711 | ||
712 | /* pixclock in ps, the rest in pixclock */ | 712 | /* pixclock in ps, the rest in pixclock */ |
713 | var->pixclock = timings.pixel_clock != 0 ? | 713 | var->pixclock = timings.pixel_clock != 0 ? |
@@ -2029,14 +2029,14 @@ static int omapfb_set_def_mode(struct omapfb2_device *fbdev, | |||
2029 | fbdev->bpp_overrides[fbdev->num_bpp_overrides].bpp = bpp; | 2029 | fbdev->bpp_overrides[fbdev->num_bpp_overrides].bpp = bpp; |
2030 | ++fbdev->num_bpp_overrides; | 2030 | ++fbdev->num_bpp_overrides; |
2031 | 2031 | ||
2032 | if (!display->check_timings || !display->set_timings) | 2032 | if (!display->driver->check_timings || !display->driver->set_timings) |
2033 | return -EINVAL; | 2033 | return -EINVAL; |
2034 | 2034 | ||
2035 | r = display->check_timings(display, &timings); | 2035 | r = display->driver->check_timings(display, &timings); |
2036 | if (r) | 2036 | if (r) |
2037 | return r; | 2037 | return r; |
2038 | 2038 | ||
2039 | display->set_timings(display, &timings); | 2039 | display->driver->set_timings(display, &timings); |
2040 | 2040 | ||
2041 | return 0; | 2041 | return 0; |
2042 | } | 2042 | } |