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

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 30b5d23e53b4..9633a68b14d7 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -93,11 +93,6 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,
                 if (!crtc->state->enable)
                         continue;
 
-                /* Legacy cursor ioctls are completely unsynced, and userspace
-                 * relies on that (by doing tons of cursor updates). */
-                if (old_state->legacy_cursor_update)
-                        continue;
-
                 kms->funcs->wait_for_crtc_commit_done(kms, crtc);
         }
 }
@@ -151,20 +146,29 @@ static void commit_worker(struct work_struct *work)
         complete_commit(container_of(work, struct msm_commit, work), true);
 }
 
+/*
+ * this func is identical to the drm_atomic_helper_check, but we keep this
+ * because we might eventually need to have a more finegrained check
+ * sequence without using the atomic helpers.
+ *
+ * In the past, we first called drm_atomic_helper_check_planes, and then
+ * drm_atomic_helper_check_modeset. We needed this because the MDP5 plane's
+ * ->atomic_check could update ->mode_changed for pixel format changes.
+ * This, however isn't needed now because if there is a pixel format change,
+ * we just assign a new hwpipe for it with a new SMP allocation. We might
+ * eventually hit a condition where we would need to do a full modeset if
+ * we run out of planes. There, we'd probably need to set mode_changed.
+ */
 int msm_atomic_check(struct drm_device *dev,
                      struct drm_atomic_state *state)
 {
         int ret;
 
-        /*
-         * msm ->atomic_check can update ->mode_changed for pixel format
-         * changes, hence must be run before we check the modeset changes.
-         */
-        ret = drm_atomic_helper_check_planes(dev, state);
+        ret = drm_atomic_helper_check_modeset(dev, state);
         if (ret)
                 return ret;
 
-        ret = drm_atomic_helper_check_modeset(dev, state);
+        ret = drm_atomic_helper_check_planes(dev, state);
         if (ret)
                 return ret;