Merge remote branch 'airlied/drm-core-next' into HEAD

1 files changed, 1 insertions, 37 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 7809d230adee..30e827aeba02 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -699,13 +699,8 @@ struct drm_driver {
         int (*suspend) (struct drm_device *, pm_message_t state);
         int (*resume) (struct drm_device *);
         int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
-        void (*dma_ready) (struct drm_device *);
         int (*dma_quiescent) (struct drm_device *);
-        int (*context_ctor) (struct drm_device *dev, int context);
         int (*context_dtor) (struct drm_device *dev, int context);
-        int (*kernel_context_switch) (struct drm_device *dev, int old,
-                                      int new);
-        void (*kernel_context_switch_unlock) (struct drm_device *dev);
 
         /**
          * get_vblank_counter - get raw hardware vblank counter
@@ -777,8 +772,6 @@ struct drm_driver {
                                         struct drm_file *file_priv);
         void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
                                             struct drm_file *file_priv);
-        resource_size_t (*get_map_ofs) (struct drm_local_map * map);
-        resource_size_t (*get_reg_ofs) (struct drm_device *dev);
         void (*set_version) (struct drm_device *dev,
                              struct drm_set_version *sv);
 
@@ -795,8 +788,6 @@ struct drm_driver {
         void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv,
                             bool from_release);
 
-        int (*proc_init)(struct drm_minor *minor);
-        void (*proc_cleanup)(struct drm_minor *minor);
         int (*debugfs_init)(struct drm_minor *minor);
         void (*debugfs_cleanup)(struct drm_minor *minor);
 
@@ -808,7 +799,6 @@ struct drm_driver {
          */
         int (*gem_init_object) (struct drm_gem_object *obj);
         void (*gem_free_object) (struct drm_gem_object *obj);
-        void (*gem_free_object_unlocked) (struct drm_gem_object *obj);
 
         /* vga arb irq handler */
         void (*vgaarb_irq)(struct drm_device *dev, bool state);
@@ -973,7 +963,6 @@ struct drm_device {
         __volatile__ long context_flag; /**< Context swapping flag */
         __volatile__ long interrupt_flag; /**< Interruption handler flag */
         __volatile__ long dma_flag;     /**< DMA dispatch flag */
-        struct timer_list timer;        /**< Timer for delaying ctx switch */
         wait_queue_head_t context_wait; /**< Processes waiting on ctx switch */
         int last_checked;               /**< Last context checked for DMA */
         int last_context;               /**< Last current context */
@@ -1046,12 +1035,6 @@ struct drm_device {
         struct drm_minor *control;              /**< Control node for card */
         struct drm_minor *primary;              /**< render type primary screen head */
 
-        /** \name Drawable information */
-        /*@{ */
-        spinlock_t drw_lock;
-        struct idr drw_idr;
-        /*@} */
-
         struct drm_mode_config mode_config;     /**< Current mode config */
 
         /** \name GEM information */
@@ -1175,8 +1158,6 @@ extern int drm_release(struct inode *inode, struct file *filp);
 extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
 extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma);
 extern void drm_vm_open_locked(struct vm_area_struct *vma);
-extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map);
-extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 
                                 /* Memory management support (drm_memory.h) */
@@ -1186,8 +1167,7 @@ extern int drm_mem_info(char *buf, char **start, off_t offset,
                         int request, int *eof, void *data);
 extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
 
-extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
-extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
+extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
 extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
 extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
                                        struct page **pages,
@@ -1239,17 +1219,6 @@ extern int drm_setsareactx(struct drm_device *dev, void *data,
 extern int drm_getsareactx(struct drm_device *dev, void *data,
                            struct drm_file *file_priv);
 
-                                /* Drawable IOCTL support (drm_drawable.h) */
-extern int drm_adddraw(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-extern int drm_rmdraw(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_update_drawable_info(struct drm_device *dev, void *data,
-                                    struct drm_file *file_priv);
-extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,
-                                                  drm_drawable_t id);
-extern void drm_drawable_free_all(struct drm_device *dev);
-
                                 /* Authentication IOCTL support (drm_auth.h) */
 extern int drm_getmagic(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
@@ -1264,7 +1233,6 @@ extern int drm_lock(struct drm_device *dev, void *data,
                     struct drm_file *file_priv);
 extern int drm_unlock(struct drm_device *dev, void *data,
                       struct drm_file *file_priv);
-extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
 extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
 extern void drm_idlelock_take(struct drm_lock_data *lock_data);
 extern void drm_idlelock_release(struct drm_lock_data *lock_data);
@@ -1359,10 +1327,6 @@ extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
 extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
 extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
-extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size_t pages, u32 type);
-extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
-extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
-extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
 extern void drm_agp_chipset_flush(struct drm_device *dev);
 
                                 /* Stub support (drm_stub.h) */