Revert "Copy the important parts of object_validate into object_create()."

This reverts f9c27aa50b715a7d21858f1ce9e4785120bd0c36 commit.

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 099ebe0..6e1de80 100644 (file)
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1587,7 +1587,6 @@ int drm_buffer_object_create(struct drm_device *dev,
 {
        struct drm_buffer_manager *bm = &dev->bm;
        struct drm_buffer_object *bo;
-       struct drm_bo_driver *driver = dev->driver->bo_driver;
        int ret = 0;
        unsigned long num_pages;
 
@@ -1646,7 +1645,7 @@ int drm_buffer_object_create(struct drm_device *dev,
                if (ret)
                        goto out_err;
        }
-
+#if 0
        bo->fence_class = 0;
        ret = driver->fence_type(bo, &bo->fence_class, &bo->fence_type);
        if (ret) {
@@ -1655,13 +1654,12 @@ int drm_buffer_object_create(struct drm_device *dev,
        }
 
        ret = drm_bo_add_ttm(bo);
+#else
+       ret = drm_buffer_object_validate(bo, 0, 0, hint & DRM_BO_HINT_DONT_BLOCK);
+#endif
        if (ret)
                goto out_err;
 
-       mutex_lock(&dev->struct_mutex);
-       drm_bo_add_to_lru(bo);
-       mutex_unlock(&dev->struct_mutex);
-
        mutex_unlock(&bo->mutex);
        *buf_obj = bo;
        return 0;
@@ -1711,8 +1709,6 @@ int drm_bo_op_ioctl(struct drm_device *dev, void *data, struct drm_file *file_pr
        void __user *curuserarg = NULL;
        int ret;
 
-       DRM_DEBUG("drm_bo_op_ioctl\n");
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1792,6 +1788,11 @@ int drm_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
        }
+#if 0
+       ret = drm_bo_lock_test(dev, file_priv);
+       if (ret)
+               goto out;
+#endif
 
        ret = drm_buffer_object_create(file_priv->head->dev,
                                       req->size, drm_bo_type_dc, req->mask,
@@ -1821,9 +1822,6 @@ int drm_bo_map_ioctl(struct drm_device *dev, void *data, struct drm_file *file_p
        struct drm_bo_info_req *req = &arg->d.req;
        struct drm_bo_info_rep *rep = &arg->d.rep;
        int ret;
-
-       DRM_DEBUG("drm_bo_map_ioctl: buffer %d\n", req->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1841,9 +1839,6 @@ int drm_bo_unmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file
 {
        struct drm_bo_handle_arg *arg = data;
        int ret;
-
-       DRM_DEBUG("drm_bo_unmap_ioctl: buffer %d\n", arg->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1862,8 +1857,6 @@ int drm_bo_reference_ioctl(struct drm_device *dev, void *data, struct drm_file *
        struct drm_user_object *uo;
        int ret;
 
-       DRM_DEBUG("drm_bo_reference_ioctl: buffer %d\n", req->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1886,8 +1879,6 @@ int drm_bo_unreference_ioctl(struct drm_device *dev, void *data, struct drm_file
        struct drm_bo_handle_arg *arg = data;
        int ret = 0;
 
-       DRM_DEBUG("drm_bo_unreference_ioctl: buffer %d\n", arg->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1904,8 +1895,6 @@ int drm_bo_info_ioctl(struct drm_device *dev, void *data, struct drm_file *file_
        struct drm_bo_info_rep *rep = &arg->d.rep;
        int ret;
 
-       DRM_DEBUG("drm_bo_info_ioctl: buffer %d\n", req->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -1924,9 +1913,6 @@ int drm_bo_wait_idle_ioctl(struct drm_device *dev, void *data, struct drm_file *
        struct drm_bo_info_req *req = &arg->d.req;
        struct drm_bo_info_rep *rep = &arg->d.rep;
        int ret;
-
-       DRM_DEBUG("drm_bo_wait_idle_ioctl: buffer %d\n", req->handle);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -2013,9 +1999,6 @@ int drm_bo_set_pin_ioctl(struct drm_device *dev, void *data,
        struct drm_buffer_object *bo;
        int ret;
 
-       DRM_DEBUG("drm_bo_set_pin_ioctl: buffer %d, pin %d\n",
-           req->handle, req->pin);
-
        if (!dev->bm.initialized) {
                DRM_ERROR("Buffer object manager is not initialized.\n");
                return -EINVAL;
@@ -2445,9 +2428,6 @@ int drm_mm_init_ioctl(struct drm_device *dev, void *data, struct drm_file *file_
        struct drm_bo_driver *driver = dev->driver->bo_driver;
        int ret;
 
-       DRM_DEBUG("drm_mm_init_ioctl: type %d, 0x%08llx offset, %dkb\n",
-           arg->mem_type, arg->p_offset * PAGE_SIZE, (int)(arg->p_size * 4));
-
        if (!driver) {
                DRM_ERROR("Buffer objects are not supported by this driver\n");
                return -EINVAL;
@@ -2502,8 +2482,6 @@ int drm_mm_takedown_ioctl(struct drm_device *dev, void *data, struct drm_file *f
        struct drm_bo_driver *driver = dev->driver->bo_driver;
        int ret;
 
-       DRM_DEBUG("drm_mm_takedown_ioctl: %d type\n", arg->mem_type);
-
        if (!driver) {
                DRM_ERROR("Buffer objects are not supported by this driver\n");
                return -EINVAL;
@@ -2541,8 +2519,6 @@ int drm_mm_lock_ioctl(struct drm_device *dev, void *data, struct drm_file *file_
        struct drm_bo_driver *driver = dev->driver->bo_driver;
        int ret;
 
-       DRM_DEBUG("drm_mm_lock_ioctl: %d type\n", arg->mem_type);
-
        if (!driver) {
                DRM_ERROR("Buffer objects are not supported by this driver\n");
                return -EINVAL;
@@ -2565,8 +2541,6 @@ int drm_mm_unlock_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
        struct drm_bo_driver *driver = dev->driver->bo_driver;
        int ret;
 
-       DRM_DEBUG("drm_mm_unlock_ioctl\n");
-
        if (!driver) {
                DRM_ERROR("Buffer objects are not supported by this driver\n");
                return -EINVAL;