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, 1 insertions, 7 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index bd18e8c4f1d0..2fe735c269fc 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -410,13 +410,7 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
                 dispc_mgr_set_gamma(omap_crtc->channel, lut, length);
         }
 
-        /*
-         * Only flush the CRTC if it is currently enabled. CRTCs that require a
-         * mode set are disabled prior plane updates and enabled afterwards.
-         * They are thus not active (regardless of what their CRTC core state
-         * reports) and the DRM core could thus call this function even though
-         * the CRTC is currently disabled. Do nothing in that case.
-         */
+        /* Only flush the CRTC if it is currently enabled. */
         if (!omap_crtc->enabled)
                 return;