Merge tag 'vmwgfx-next-2018-12-05' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2018-12-05

Page flip with damage by Deepak and others,
Various vmwgfx minor fixes anc cleanups.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181205103554.3675-1-thellstrom@vmware.com

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index 30a6d1edd5fe..c40889888a16 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -517,6 +517,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,
 {
         struct drm_device *dev = plane->dev;
         struct drm_mode_config *config = &dev->mode_config;
+        bool replaced = false;
+        int ret;
 
         if (property == config->prop_fb_id) {
                 struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL, val);
@@ -570,6 +572,14 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,
                 state->color_encoding = val;
         } else if (property == plane->color_range_property) {
                 state->color_range = val;
+        } else if (property == config->prop_fb_damage_clips) {
+                ret = drm_atomic_replace_property_blob_from_id(dev,
+                                        &state->fb_damage_clips,
+                                        val,
+                                        -1,
+                                        sizeof(struct drm_rect),
+                                        &replaced);
+                return ret;
         } else if (plane->funcs->atomic_set_property) {
                 return plane->funcs->atomic_set_property(plane, state,
                                 property, val);
@@ -625,6 +635,9 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
                 *val = state->color_encoding;
         } else if (property == plane->color_range_property) {
                 *val = state->color_range;
+        } else if (property == config->prop_fb_damage_clips) {
+                *val = (state->fb_damage_clips) ?
+                        state->fb_damage_clips->base.id : 0;
         } else if (plane->funcs->atomic_get_property) {
                 return plane->funcs->atomic_get_property(plane, state, property, val);
         } else {