From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 18 Apr 2007 04:11:49 +0000 (+1000)
Subject: Merge branch 'origin' into modesetting-101
X-Git-Tag: submit/1.0/20121108.012404~642^2~422^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e46e028bd21552331ca4db409c2b45e54491ced6;p=profile%2Fivi%2Flibdrm.git

Merge branch 'origin' into modesetting-101

Conflicts:

	linux-core/drm_bo.c

Merge in changes from master from Thomas fixiing TTM problems
---

e46e028bd21552331ca4db409c2b45e54491ced6
diff --cc linux-core/drm_bo.c
index d6dce10,450e448..27016d8
--- a/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,