diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 12:34:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 12:34:44 +1000 |
| commit | ed914f69f8f979ea2b664abc4f1437235cf3db35 (patch) | |
| tree | 43d839d79d02f4a9415199a2db7a4b6cfeb281eb /include/linux | |
| parent | bb0f78dd7ded88082b2430c43c65bc821c4ea360 (diff) | |
| parent | edb37a95c58147f89713e6c5cd220fa8fdfb4833 (diff) | |
Merge tag 'of_videomode_helper' of git://git.pengutronix.de/git/str/linux into drm-next
videomode helpers for of + devicetree stuff, required for new kms drivers
(not the fbdev maintainer).
* tag 'of_videomode_helper' of git://git.pengutronix.de/git/str/linux:
drm_modes: add of_videomode helpers
drm_modes: add videomode helpers
fbmon: add of_videomode helpers
fbmon: add videomode helpers
video: add of helper for display timings/videomode
video: add display_timing and videomode
viafb: rename display_timing to via_display_timing
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index c7a95714b1fe..58b98606ac26 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -19,6 +19,8 @@ struct vm_area_struct; struct fb_info; struct device; struct file; +struct videomode; +struct device_node; /* Definitions below are used in the parsed monitor specs */ #define FB_DPMS_ACTIVE_OFF 1 @@ -714,6 +716,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); +extern int of_get_fb_videomode(struct device_node *np, + struct fb_videomode *fb, + int index); +extern int fb_videomode_from_videomode(const struct videomode *vm, + struct fb_videomode *fbmode); + /* drivers/video/modedb.c */ #define VESA_MODEDB_SIZE 34 extern void fb_var_to_videomode(struct fb_videomode *mode, |