Skip to content

Commit

Permalink
OMAP: DSS2: OMAPFB: implement OMAPFB_GET_DISPLAY_INFO
Browse files Browse the repository at this point in the history
Previously the only place to get the size of the display was from the
DSS's sysfs interface, making, for example, configuring overlays and doing
updates on manual displays more difficult.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Tomi Valkeinen committed Feb 15, 2010
1 parent 92fe0ff commit 6dd2e42
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
24 changes: 24 additions & 0 deletions drivers/video/omap2/omapfb/omapfb-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
struct omapfb_memory_read memory_read;
struct omapfb_vram_info vram_info;
struct omapfb_tearsync_info tearsync_info;
struct omapfb_display_info display_info;
} p;

int r = 0;
Expand Down Expand Up @@ -741,6 +742,29 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
break;
}

case OMAPFB_GET_DISPLAY_INFO: {
u16 xres, yres;

DBG("ioctl GET_DISPLAY_INFO\n");

if (display == NULL) {
r = -ENODEV;
break;
}

display->get_resolution(display, &xres, &yres);

p.display_info.xres = xres;
p.display_info.yres = yres;
p.display_info.width = 0;
p.display_info.height = 0;

if (copy_to_user((void __user *)arg, &p.display_info,
sizeof(p.display_info)))
r = -EFAULT;
break;
}

default:
dev_err(fbdev->dev, "Unknown ioctl 0x%x\n", cmd);
r = -EINVAL;
Expand Down
9 changes: 9 additions & 0 deletions include/linux/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#define OMAPFB_WAITFORGO OMAP_IO(60)
#define OMAPFB_GET_VRAM_INFO OMAP_IOR(61, struct omapfb_vram_info)
#define OMAPFB_SET_TEARSYNC OMAP_IOW(62, struct omapfb_tearsync_info)
#define OMAPFB_GET_DISPLAY_INFO OMAP_IOR(63, struct omapfb_display_info)

#define OMAPFB_CAPS_GENERIC_MASK 0x00000fff
#define OMAPFB_CAPS_LCDC_MASK 0x00fff000
Expand Down Expand Up @@ -206,6 +207,14 @@ struct omapfb_tearsync_info {
__u16 reserved2;
};

struct omapfb_display_info {
__u16 xres;
__u16 yres;
__u32 width; /* phys width of the display in micrometers */
__u32 height; /* phys height of the display in micrometers */
__u32 reserved[5];
};

#ifdef __KERNEL__

#include <plat/board.h>
Expand Down

0 comments on commit 6dd2e42

Please sign in to comment.