Merge branch 'master' into modesetting-101 - TTM & typedef removal

[android-x86/external-libdrm.git] / linux-core / drmP.h

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index f8ca3f4..64f9a63 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -167,6 +167,8 @@ struct drm_file;
 
 #include "drm_compat.h"
 
+#include "drm_crtc.h"
+
 /***********************************************************************/
 /** \name Macros to make printk easier */
 /*@{*/
@@ -433,6 +435,8 @@ struct drm_file {
        struct drm_open_hash refd_object_hash[_DRM_NO_REF_TYPES];
        struct file *filp;
        void *driver_priv;
+
+       struct list_head fbs;
 };
 
 /** Wait queue */
@@ -660,6 +664,10 @@ struct drm_driver {
        unsigned long (*get_reg_ofs) (struct drm_device * dev);
        void (*set_version) (struct drm_device * dev, struct drm_set_version * sv);
 
+       /* FB routines, if present */
+       int (*fb_probe)(struct drm_device *dev, struct drm_crtc *crtc);
+       int (*fb_remove)(struct drm_device *dev, struct drm_crtc *crtc);
+
        struct drm_fence_driver *fence_driver;
        struct drm_bo_driver *bo_driver;
 
@@ -828,6 +836,9 @@ struct drm_device {
        spinlock_t drw_lock;
        struct idr drw_idr;
        /*@} */
+
+       /* DRM mode setting */
+       struct drm_mode_config mode_config;
 };
 
 #if __OS_HAS_AGP