diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-22 09:48:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-22 09:48:02 +1000 |
| commit | c0d2792b2ad713d6a857efabc12b7dc4207a5d08 (patch) | |
| tree | e68fd2a38ade3025bca4b6161a6f3a2dab07deed /include | |
| parent | ca1130de2a5874c94ab73fc93f518dd9bc6c1886 (diff) | |
| parent | 5b7e944ec87da878ef828d06094720be8884d33a (diff) | |
| download | linux-c0d2792b2ad713d6a857efabc12b7dc4207a5d08.tar.gz linux-c0d2792b2ad713d6a857efabc12b7dc4207a5d08.zip | |
Merge tag 'atmel-hlcdc-drm-3.20' of https://github.com/bbrezillon/linux-at91 into drm-next
Add atmel HLCDC driver.
* tag 'atmel-hlcdc-drm-3.20' of https://github.com/bbrezillon/linux-at91:
drm: add DT bindings documentation for atmel-hlcdc-dc driver
drm: add Atmel HLCDC Display Controller support
drm: panel: simple-panel: add bus format information for foxlink panel
drm: panel: simple-panel: add support for bus_format retrieval
drm: add bus_formats and num_bus_formats fields to drm_display_info
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index f444263055c5..0ecfb7c80601 100644 --- 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; @@ -1282,6 +1286,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) { |