Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel...

[firefly-linux-kernel-4.4.55.git] / include / drm / drm_crtc.h

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 019c9b5621449007049fe9fdf5d8cb44e725981d..02614170c0345a100af800b93c51c7658b033ceb 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -766,6 +766,9 @@ struct drm_plane_state {
        uint32_t src_x, src_y;
        uint32_t src_h, src_w;
 
+       /* Plane rotation */
+       unsigned int rotation;
+
        struct drm_atomic_state *state;
 };
 
@@ -1097,6 +1100,7 @@ struct drm_mode_config {
        /* output poll support */
        bool poll_enabled;
        bool poll_running;
+       bool delayed_event;
        struct delayed_work output_poll_work;
 
        /* pointers to standard properties */