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/drm/drmP.h | |
| 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/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e74731c1a912..3aaa50d64451 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -85,6 +85,9 @@ struct module; struct drm_file; struct drm_device; +struct device_node; +struct videomode; + #include <drm/drm_os_linux.h> #include <drm/drm_hashtab.h> #include <drm/drm_mm.h> @@ -1469,6 +1472,12 @@ extern struct drm_display_mode * drm_mode_create_from_cmdline_mode(struct drm_device *dev, struct drm_cmdline_mode *cmd); +extern int drm_display_mode_from_videomode(const struct videomode *vm, + struct drm_display_mode *dmode); +extern int of_get_drm_display_mode(struct device_node *np, + struct drm_display_mode *dmode, + int index); + /* Modesetting support */ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); |