summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 12:57:01 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 12:57:01 +1000
commit50cbf77a87b04585de713fd759d51d2e89c85fac (patch)
tree347b36a1560fe8c0c888432ac648158173cdcdac /include
parente8310cfab5ca8c3201c9c4e2a432cc54d1a2b518 (diff)
parent5c61259e6c7290082108e93815f7f72f27da14f4 (diff)
Merge commit 'drm/drm-next'
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_crtc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 7300fb866767..125994d8ac0b 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -736,4 +736,10 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv);
extern bool drm_detect_hdmi_monitor(struct edid *edid);
+extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
+ int hdisplay, int vdisplay, int vrefresh,
+ bool reduced, bool interlaced);
+extern struct drm_display_mode *drm_gtf_mode(struct drm_device *dev,
+ int hdisplay, int vdisplay, int vrefresh,
+ bool interlaced, int margins);
#endif /* __DRM_CRTC_H__ */