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

[sfrench/cifs-2.6.git] / include / drm / drm_crtc.h

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 7e2963cad543c286e6016d3d40105be68cc36774..5e9b15a0e8c5c1304ba93e4e3d206c4439c8b56b 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -284,12 +284,12 @@ struct drm_crtc_state {
        u32 target_vblank;
 
        /**
-        * @pageflip_flags:
+        * @async_flip:
         *
-        * DRM_MODE_PAGE_FLIP_* flags, as passed to the page flip ioctl.
-        * Zero in any other case.
+        * This is set when DRM_MODE_PAGE_FLIP_ASYNC is set in the legacy
+        * PAGE_FLIP IOCTL. It's not wired up for the atomic IOCTL itself yet.
         */
-       u32 pageflip_flags;
+       bool async_flip;
 
        /**
         * @vrr_enabled:
@@ -1107,7 +1107,7 @@ struct drm_crtc {
        /**
         * @self_refresh_data: Holds the state for the self refresh helpers
         *
-        * Initialized via drm_self_refresh_helper_register().
+        * Initialized via drm_self_refresh_helper_init().
         */
        struct drm_self_refresh_data *self_refresh_data;
 };