Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index dab838b02fb75db61ee9162f472924db9a89a017..c2e9c5283136bc62f9b4baf18f46d204c41bc6d9 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -403,6 +403,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
                state->src_w = val;
        } else if (property == config->prop_src_h) {
                state->src_h = val;
+       } else if (property == config->rotation_property) {
+               state->rotation = val;
        } else if (plane->funcs->atomic_set_property) {
                return plane->funcs->atomic_set_property(plane, state,
                                property, val);
@@ -1276,7 +1278,9 @@ retry:
                                goto fail;
                        }
 
-                       if (get_user(prop_value, prop_values_ptr + copied_props)) {
+                       if (copy_from_user(&prop_value,
+                                          prop_values_ptr + copied_props,
+                                          sizeof(prop_value))) {
                                ret = -EFAULT;
                                goto fail;
                        }