Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel...

[deliverable/linux.git] / include / drm / drm_crtc.h

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 65da9fb939a70f5e52e031dfafdff4be9d7f6811..ac55ab0dc88b0eaba336072de0059d142f130272 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -31,6 +31,7 @@
 #include <linux/idr.h>
 #include <linux/fb.h>
 #include <linux/hdmi.h>
+#include <linux/media-bus-format.h>
 #include <uapi/drm/drm_mode.h>
 #include <uapi/drm/drm_fourcc.h>
 #include <drm/drm_modeset_lock.h>
@@ -139,6 +140,9 @@ struct drm_display_info {
        enum subpixel_order subpixel_order;
        u32 color_formats;
 
+       const u32 *bus_formats;
+       unsigned int num_bus_formats;
+
        /* Mask of supported hdmi deep color modes */
        u8 edid_hdmi_dc_modes;
 
@@ -1283,6 +1287,10 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector);
 extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
                                                   const struct edid *edid);
 
+extern int drm_display_info_set_bus_formats(struct drm_display_info *info,
+                                           const u32 *formats,
+                                           unsigned int num_formats);
+
 static inline bool drm_property_type_is(struct drm_property *property,
                uint32_t type)
 {