aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/omapfb/omapfb-main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 6a383ab2bef2..212d2efb380c 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1254,7 +1254,7 @@ exit:
1254 1254
1255 if (r == 0 && do_update && display->update) { 1255 if (r == 0 && do_update && display->update) {
1256 u16 w, h; 1256 u16 w, h;
1257 display->get_resolution(display, &w, &h); 1257 display->driver->get_resolution(display, &w, &h);
1258 1258
1259 r = display->update(display, 0, 0, w, h); 1259 r = display->update(display, 0, 0, w, h);
1260 } 1260 }
@@ -1427,7 +1427,7 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
1427 if (!size) { 1427 if (!size) {
1428 u16 w, h; 1428 u16 w, h;
1429 1429
1430 display->get_resolution(display, &w, &h); 1430 display->driver->get_resolution(display, &w, &h);
1431 1431
1432 if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) { 1432 if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
1433 size = max(omap_vrfb_min_phys_size(w, h, bytespp), 1433 size = max(omap_vrfb_min_phys_size(w, h, bytespp),
@@ -1745,7 +1745,7 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
1745 u16 w, h; 1745 u16 w, h;
1746 int rotation = (var->rotate + ofbi->rotation[0]) % 4; 1746 int rotation = (var->rotate + ofbi->rotation[0]) % 4;
1747 1747
1748 display->get_resolution(display, &w, &h); 1748 display->driver->get_resolution(display, &w, &h);
1749 1749
1750 if (rotation == FB_ROTATE_CW || 1750 if (rotation == FB_ROTATE_CW ||
1751 rotation == FB_ROTATE_CCW) { 1751 rotation == FB_ROTATE_CCW) {
@@ -2197,7 +2197,8 @@ static int omapfb_probe(struct platform_device *pdev)
2197 def_display->set_update_mode(def_display, 2197 def_display->set_update_mode(def_display,
2198 OMAP_DSS_UPDATE_MANUAL); 2198 OMAP_DSS_UPDATE_MANUAL);
2199 2199
2200 def_display->get_resolution(def_display, &w, &h); 2200 def_display->driver->get_resolution(def_display,
2201 &w, &h);
2201 def_display->update(def_display, 0, 0, w, h); 2202 def_display->update(def_display, 0, 0, w, h);
2202#endif 2203#endif
2203 } else { 2204 } else {