Merge branch 'origin' into modesetting-101

Conflicts:

	linux-core/drm_bo.c

Merge in changes from master from Thomas fixiing TTM problems

diff --cc linux-core/drm_bo.c
index d6dce10,450e448..27016d8
--- 1/linux-core/drm_bo.c
--- 2/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@@ -1684,9 -1665,11 +1680,12 @@@ int drm_bo_ioctl(DRM_IOCTL_ARGS
                rep.ret = 0;
                switch (req->op) {
                case drm_bo_create:
+                       rep.ret = drm_bo_lock_test(dev, filp);
+                       if (rep.ret)
+                               break;  
                        rep.ret =
 -                          drm_buffer_object_create(priv, req->size,
 +                          drm_buffer_object_create(priv->head->dev,
 +                                                   req->size,
                                                     req->type,
                                                     req->mask,
                                                     req->hint,
@@@ -1735,17 -1718,8 +1734,7 @@@
                                                      drm_buffer_type, &uo);
                        if (rep.ret)
                                break;
-                       mutex_lock(&dev->struct_mutex);
-                       uo = drm_lookup_user_object(priv, req->handle);
-                       entry =
-                           drm_user_object_entry(uo, drm_buffer_object_t,
-                                                 base);
-                       /* I don't think this is needed - D.A. */
-                       //                      atomic_dec(&entry->usage);
-                       mutex_unlock(&dev->struct_mutex);
-                       mutex_lock(&entry->mutex);
-                       drm_bo_fill_rep_arg(entry, &rep);
-                       mutex_unlock(&entry->mutex);
 -
+                       rep.ret = drm_bo_handle_info(priv, req->handle, &rep);
                        break;
                case drm_bo_unreference:
                        rep.ret = drm_user_object_unref(priv, req->handle,