Merge branch 'drm-minor' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

This series contains several cleanups for the DRM-minor handling. All but the
last one reviewed by Daniel and tested by Thierry. Initially, the series
included patches to convert minor-handling to a common base-ID, but have
been NACKed by Daniel so I dropped them and only included the main part in the
last patch. With this in place, drm_global_mutex is no longer needed for
minor-handling (but still for device unregistration..).
There are some pending patches that try to remove the global mutex entirely, but
they need some more reviews and thus are not included.
* 'drm-minor' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: make minors independent of global lock
  drm: inline drm_minor_get_id()
  drm: coding-style fixes in minor handling
  drm: remove redundant minor->device field
  drm: remove unneeded #ifdef CONFIG_DEBUGFS
  drm: rename drm_unplug/get_minor() to drm_minor_register/unregister()
  drm: move drm_put_minor() to drm_minor_free()
  drm: allocate minors early
  drm: add minor-lookup/release helpers
  drm: provide device-refcount
  drm: turn DRM_MINOR_* into enum
  drm: remove unused DRM_MINOR_UNASSIGNED
  drm: skip redundant minor-lookup in open path
  drm: group dev-lifetime related members

1 files changed, 26 insertions, 15 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 04a7f31301f8..538079030be0 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -43,6 +43,7 @@
 #include <asm/current.h>
 #endif                          /* __alpha__ */
 #include <linux/kernel.h>
+#include <linux/kref.h>
 #include <linux/miscdevice.h>
 #include <linux/fs.h>
 #include <linux/init.h>
@@ -1008,10 +1009,12 @@ struct drm_driver {
         struct list_head legacy_dev_list;
 };
 
-#define DRM_MINOR_UNASSIGNED 0
-#define DRM_MINOR_LEGACY 1
-#define DRM_MINOR_CONTROL 2
-#define DRM_MINOR_RENDER 3
+enum drm_minor_type {
+        DRM_MINOR_LEGACY,
+        DRM_MINOR_CONTROL,
+        DRM_MINOR_RENDER,
+        DRM_MINOR_CNT,
+};
 
 /**
  * Info file list entry. This structure represents a debugfs or proc file to
@@ -1040,7 +1043,6 @@ struct drm_info_node {
 struct drm_minor {
         int index;                      /**< Minor device number */
         int type;                       /**< Control or render */
-        dev_t device;                   /**< Device number for mknod */
         struct device *kdev;            /**< Linux device */
         struct drm_device *dev;
 
@@ -1098,6 +1100,19 @@ struct drm_device {
         char *devname;                  /**< For /proc/interrupts */
         int if_version;                 /**< Highest interface version set */
 
+        /** \name Lifetime Management */
+        /*@{ */
+        struct kref ref;                /**< Object ref-count */
+        struct device *dev;             /**< Device structure of bus-device */
+        struct drm_driver *driver;      /**< DRM driver managing the device */
+        void *dev_private;              /**< DRM driver private data */
+        struct address_space *dev_mapping;      /**< Private addr-space just for the device */
+        struct drm_minor *control;              /**< Control node */
+        struct drm_minor *primary;              /**< Primary node */
+        struct drm_minor *render;               /**< Render node */
+        atomic_t unplugged;                     /**< Flag whether dev is dead */
+        /*@} */
+
         /** \name Locks */
         /*@{ */
         spinlock_t count_lock;          /**< For inuse, drm_device::open_count, drm_device::buf_use */
@@ -1171,7 +1186,6 @@ struct drm_device {
 
         struct drm_agp_head *agp;       /**< AGP data */
 
-        struct device *dev;             /**< Device structure */
         struct pci_dev *pdev;           /**< PCI device structure */
 #ifdef __alpha__
         struct pci_controller *hose;
@@ -1182,17 +1196,11 @@ struct drm_device {
 
         struct drm_sg_mem *sg;  /**< Scatter gather memory */
         unsigned int num_crtcs;                  /**< Number of CRTCs on this device */
-        void *dev_private;              /**< device private data */
-        struct address_space *dev_mapping;
         struct drm_sigdata sigdata;        /**< For block_all_signals */
         sigset_t sigmask;
 
-        struct drm_driver *driver;
         struct drm_local_map *agp_buffer_map;
         unsigned int agp_buffer_token;
-        struct drm_minor *control;              /**< Control node for card */
-        struct drm_minor *primary;              /**< render type primary screen head */
-        struct drm_minor *render;               /**< render node for card */
 
         struct drm_mode_config mode_config;     /**< Current mode config */
 
@@ -1203,8 +1211,6 @@ struct drm_device {
         struct drm_vma_offset_manager *vma_offset_manager;
         /*@} */
         int switch_power_state;
-
-        atomic_t unplugged; /* device has been unplugged or gone away */
 };
 
 #define DRM_SWITCH_POWER_ON 0
@@ -1661,9 +1667,14 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map)
 
 struct drm_device *drm_dev_alloc(struct drm_driver *driver,
                                  struct device *parent);
-void drm_dev_free(struct drm_device *dev);
+void drm_dev_ref(struct drm_device *dev);
+void drm_dev_unref(struct drm_device *dev);
 int drm_dev_register(struct drm_device *dev, unsigned long flags);
 void drm_dev_unregister(struct drm_device *dev);
+
+struct drm_minor *drm_minor_acquire(unsigned int minor_id);
+void drm_minor_release(struct drm_minor *minor);
+
 /*@}*/
 
 /* PCI section */