Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[deliverable/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_kms.h

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index d41928c12a42e26f27453cad349219d53f6662c2..57203212c501dc0577d45d76661c7fafe6651351 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -178,6 +178,9 @@ struct vmw_display_unit {
        int gui_x;
        int gui_y;
        bool is_implicit;
+       bool active_implicit;
+       int set_gui_x;
+       int set_gui_y;
 };
 
 #define vmw_crtc_to_du(x) \
@@ -254,6 +257,18 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,
                            struct drm_crtc **p_crtc,
                            struct drm_display_mode **p_mode);
 void vmw_guess_mode_timing(struct drm_display_mode *mode);
+void vmw_kms_del_active(struct vmw_private *dev_priv,
+                       struct vmw_display_unit *du);
+void vmw_kms_add_active(struct vmw_private *dev_priv,
+                       struct vmw_display_unit *du,
+                       struct vmw_framebuffer *vfb);
+bool vmw_kms_crtc_flippable(struct vmw_private *dev_priv,
+                           struct drm_crtc *crtc);
+void vmw_kms_update_implicit_fb(struct vmw_private *dev_priv,
+                               struct drm_crtc *crtc);
+void vmw_kms_create_implicit_placement_property(struct vmw_private *dev_priv,
+                                               bool immutable);
+
 
 /*
  * Legacy display unit functions - vmwgfx_ldu.c