Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / drm_mode_config.c

diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
index 037e243ec863f1952b7e7c1019f2be24ff98407e..4a1c2023ccf02bdaeb84d9b23c0d82818f84df3f 100644 (file)
--- a/drivers/gpu/drm/drm_mode_config.c
+++ b/drivers/gpu/drm/drm_mode_config.c
@@ -297,6 +297,12 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)
                return -ENOMEM;
        dev->mode_config.prop_crtc_id = prop;
 
+       prop = drm_property_create(dev, DRM_MODE_PROP_BLOB, "FB_DAMAGE_CLIPS",
+                                  0);
+       if (!prop)
+               return -ENOMEM;
+       dev->mode_config.prop_fb_damage_clips = prop;
+
        prop = drm_property_create_bool(dev, DRM_MODE_PROP_ATOMIC,
                        "ACTIVE");
        if (!prop)
@@ -310,6 +316,12 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)
                return -ENOMEM;
        dev->mode_config.prop_mode_id = prop;
 
+       prop = drm_property_create_bool(dev, 0,
+                       "VRR_ENABLED");
+       if (!prop)
+               return -ENOMEM;
+       dev->mode_config.prop_vrr_enabled = prop;
+
        prop = drm_property_create(dev,
                        DRM_MODE_PROP_BLOB,
                        "DEGAMMA_LUT", 0);