2 files changed, 43 insertions, 0 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index caec5c3634bb..df90048de92e 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -762,6 +762,40 @@ static void drm_mode_remove(struct drm_connector *connector,
 }
 
 /**
+ * drm_display_info_set_bus_formats - set the supported bus formats
+ * @info: display info to store bus formats in
+ * @fmts: array containing the supported bus formats
+ * @nfmts: the number of entries in the fmts array
+ *
+ * Store the supported bus formats in display info structure.
+ * See MEDIA_BUS_FMT_* definitions in include/uapi/linux/media-bus-format.h for
+ * a full list of available formats.
+ */
+int drm_display_info_set_bus_formats(struct drm_display_info *info,
+                                     const u32 *formats,
+                                     unsigned int num_formats)
+{
+        u32 *fmts = NULL;
+
+        if (!formats && num_formats)
+                return -EINVAL;
+
+        if (formats && num_formats) {
+                fmts = kmemdup(formats, sizeof(*formats) * num_formats,
+                               GFP_KERNEL);
+                if (!formats)
+                        return -ENOMEM;
+        }
+
+        kfree(info->bus_formats);
+        info->bus_formats = fmts;
+        info->num_bus_formats = num_formats;
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_display_info_set_bus_formats);
+
+/**
  * drm_connector_get_cmdline_mode - reads the user's cmdline mode
  * @connector: connector to quwery
  *
@@ -923,6 +957,7 @@ void drm_connector_cleanup(struct drm_connector *connector)
         ida_remove(&drm_connector_enum_list[connector->connector_type].ida,
                    connector->connector_type_id);
 
+        kfree(connector->display_info.bus_formats);
         drm_mode_object_put(dev, &connector->base);
         kfree(connector->name);
         connector->name = NULL;
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)
 {