drm: reorganise minor number handling using backported modesetting code.

rips out the head crap and replaces it with an idr and drm_minor structure

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index b20c1e950d3e..c234c6f24a8d 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -90,7 +90,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)
 static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_map *map = NULL;
         struct drm_map_list *r_list;
         struct drm_hash_item *hash;
@@ -207,7 +207,7 @@ static int drm_do_vm_shm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 static void drm_vm_shm_close(struct vm_area_struct *vma)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_vma_entry *pt, *temp;
         struct drm_map *map;
         struct drm_map_list *r_list;
@@ -286,7 +286,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_device_dma *dma = dev->dma;
         unsigned long offset;
         unsigned long page_nr;
@@ -321,7 +321,7 @@ static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_map *map = (struct drm_map *) vma->vm_private_data;
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_sg_mem *entry = dev->sg;
         unsigned long offset;
         unsigned long map_offset;
@@ -402,7 +402,7 @@ static struct vm_operations_struct drm_vm_sg_ops = {
 static void drm_vm_open_locked(struct vm_area_struct *vma)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_vma_entry *vma_entry;
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -420,7 +420,7 @@ static void drm_vm_open_locked(struct vm_area_struct *vma)
 static void drm_vm_open(struct vm_area_struct *vma)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
 
         mutex_lock(&dev->struct_mutex);
         drm_vm_open_locked(vma);
@@ -438,7 +438,7 @@ static void drm_vm_open(struct vm_area_struct *vma)
 static void drm_vm_close(struct vm_area_struct *vma)
 {
         struct drm_file *priv = vma->vm_file->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_vma_entry *pt, *temp;
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -473,7 +473,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
         struct drm_device_dma *dma;
         unsigned long length = vma->vm_end - vma->vm_start;
 
-        dev = priv->head->dev;
+        dev = priv->minor->dev;
         dma = dev->dma;
         DRM_DEBUG("start = 0x%lx, end = 0x%lx, page offset = 0x%lx\n",
                   vma->vm_start, vma->vm_end, vma->vm_pgoff);
@@ -543,7 +543,7 @@ EXPORT_SYMBOL(drm_core_get_reg_ofs);
 static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 {
         struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         struct drm_map *map = NULL;
         unsigned long offset = 0;
         struct drm_hash_item *hash;
@@ -661,7 +661,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 int drm_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = priv->minor->dev;
         int ret;
 
         mutex_lock(&dev->struct_mutex);