Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 63d7b8eb6c1746654c36005f5674d51fcd50306c..0c0c39bac23da21a368ef94681da10b173994660 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -296,9 +296,9 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
                        drm_plane_force_disable(plane);
 
                if (dev->mode_config.rotation_property) {
-                       drm_object_property_set_value(&plane->base,
-                                       dev->mode_config.rotation_property,
-                                       BIT(DRM_ROTATE_0));
+                       drm_mode_plane_set_obj_prop(plane,
+                                                   dev->mode_config.rotation_property,
+                                                   BIT(DRM_ROTATE_0));
                }
        }