Merge drm/drm-next into drm-misc-next

[linux-2.6-block.git] / include / drm / drm_connector.h

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index e8ad30d7561afe7948bebcd8215a0ae03576b04b..994161374a4928e33e668674f8120589d6661bc1 100644 (file)
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -977,6 +977,17 @@ struct drm_connector {
         */
        struct drm_property *scaling_mode_property;
 
+       /**
+        * @vrr_capable_property: Optional property to help userspace
+        * query hardware support for variable refresh rate on a connector.
+        * connector. Drivers can add the property to a connector by
+        * calling drm_connector_attach_vrr_capable_property().
+        *
+        * This should be updated only by calling
+        * drm_connector_set_vrr_capable_property().
+        */
+       struct drm_property *vrr_capable_property;
+
        /**
         * @content_protection_property: DRM ENUM property for content
         * protection. See drm_connector_attach_content_protection_property().
@@ -1253,6 +1264,8 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev);
 int drm_connector_attach_content_type_property(struct drm_connector *dev);
 int drm_connector_attach_scaling_mode_property(struct drm_connector *connector,
                                               u32 scaling_mode_mask);
+int drm_connector_attach_vrr_capable_property(
+               struct drm_connector *connector);
 int drm_connector_attach_content_protection_property(
                struct drm_connector *connector);
 int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
@@ -1269,6 +1282,8 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
                                       const struct edid *edid);
 void drm_connector_set_link_status_property(struct drm_connector *connector,
                                            uint64_t link_status);
+void drm_connector_set_vrr_capable_property(
+               struct drm_connector *connector, bool capable);
 int drm_connector_init_panel_orientation_property(
        struct drm_connector *connector, int width, int height);
 int drm_connector_attach_max_bpc_property(struct drm_connector *connector,