Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 55bb8a82d612..a0c365f2e521 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -33,6 +33,7 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
 #include "drmP.h"
 #include "drm_core.h"
 
@@ -128,6 +129,7 @@ struct drm_master *drm_master_get(struct drm_master *master)
         kref_get(&master->refcount);
         return master;
 }
+EXPORT_SYMBOL(drm_master_get);
 
 static void drm_master_destroy(struct kref *kref)
 {
@@ -170,10 +172,13 @@ void drm_master_put(struct drm_master **master)
         kref_put(&(*master)->refcount, drm_master_destroy);
         *master = NULL;
 }
+EXPORT_SYMBOL(drm_master_put);
 
 int drm_setmaster_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
 {
+        int ret = 0;
+
         if (file_priv->is_master)
                 return 0;
 
@@ -188,6 +193,13 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
                 mutex_lock(&dev->struct_mutex);
                 file_priv->minor->master = drm_master_get(file_priv->master);
                 file_priv->is_master = 1;
+                if (dev->driver->master_set) {
+                        ret = dev->driver->master_set(dev, file_priv, false);
+                        if (unlikely(ret != 0)) {
+                                file_priv->is_master = 0;
+                                drm_master_put(&file_priv->minor->master);
+                        }
+                }
                 mutex_unlock(&dev->struct_mutex);
         }
 
@@ -204,6 +216,8 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
                 return -EINVAL;
 
         mutex_lock(&dev->struct_mutex);
+        if (dev->driver->master_drop)
+                dev->driver->master_drop(dev, file_priv, false);
         drm_master_put(&file_priv->minor->master);
         file_priv->is_master = 0;
         mutex_unlock(&dev->struct_mutex);
@@ -220,9 +234,11 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
         INIT_LIST_HEAD(&dev->ctxlist);
         INIT_LIST_HEAD(&dev->vmalist);
         INIT_LIST_HEAD(&dev->maplist);
+        INIT_LIST_HEAD(&dev->vblank_event_list);
 
         spin_lock_init(&dev->count_lock);
         spin_lock_init(&dev->drw_lock);
+        spin_lock_init(&dev->event_lock);
         init_timer(&dev->timer);
         mutex_init(&dev->struct_mutex);
         mutex_init(&dev->ctxlist_mutex);
@@ -500,8 +516,6 @@ void drm_put_dev(struct drm_device *dev)
         }
         driver = dev->driver;
 
-        drm_vblank_cleanup(dev);
-
         drm_lastclose(dev);
 
         if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
@@ -521,6 +535,8 @@ void drm_put_dev(struct drm_device *dev)
                 dev->agp = NULL;
         }
 
+        drm_vblank_cleanup(dev);
+
         list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
                 drm_rmmap(dev, r_list->map);
         drm_ht_remove(&dev->map_hash);