diff options
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-ioctl.c')
-rw-r--r-- | drivers/video/omap2/omapfb/omapfb-ioctl.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c index 6f435450987e..cff450392b79 100644 --- a/drivers/video/omap2/omapfb/omapfb-ioctl.c +++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/omapfb.h> | 28 | #include <linux/omapfb.h> |
29 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
30 | 30 | ||
31 | #include <plat/display.h> | 31 | #include <video/omapdss.h> |
32 | #include <plat/vrfb.h> | 32 | #include <plat/vrfb.h> |
33 | #include <plat/vram.h> | 33 | #include <plat/vram.h> |
34 | 34 | ||
@@ -895,8 +895,16 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) | |||
895 | 895 | ||
896 | p.display_info.xres = xres; | 896 | p.display_info.xres = xres; |
897 | p.display_info.yres = yres; | 897 | p.display_info.yres = yres; |
898 | p.display_info.width = 0; | 898 | |
899 | p.display_info.height = 0; | 899 | if (display->driver->get_dimensions) { |
900 | u32 w, h; | ||
901 | display->driver->get_dimensions(display, &w, &h); | ||
902 | p.display_info.width = w; | ||
903 | p.display_info.height = h; | ||
904 | } else { | ||
905 | p.display_info.width = 0; | ||
906 | p.display_info.height = 0; | ||
907 | } | ||
900 | 908 | ||
901 | if (copy_to_user((void __user *)arg, &p.display_info, | 909 | if (copy_to_user((void __user *)arg, &p.display_info, |
902 | sizeof(p.display_info))) | 910 | sizeof(p.display_info))) |