Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[cascardo/linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_bo_list.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index eacd810..823bf5e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
                struct amdgpu_bo *bo;
                struct mm_struct *usermm;
 
-               gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
+               gobj = drm_gem_object_lookup(filp, info[i].bo_handle);
                if (!gobj) {
                        r = -ENOENT;
                        goto error_free;
@@ -263,7 +263,7 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
                for (i = 0; i < args->in.bo_number; ++i) {
                        if (copy_from_user(&info[i], uptr, bytes))
                                goto error_free;
-                       
+
                        uptr += args->in.bo_info_size;
                }
        }
@@ -271,7 +271,7 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
        switch (args->in.operation) {
        case AMDGPU_BO_LIST_OP_CREATE:
                r = amdgpu_bo_list_create(fpriv, &list, &handle);
-               if (r) 
+               if (r)
                        goto error_free;
 
                r = amdgpu_bo_list_set(adev, filp, list, info,
@@ -281,7 +281,7 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
                        goto error_free;
 
                break;
-               
+
        case AMDGPU_BO_LIST_OP_DESTROY:
                amdgpu_bo_list_destroy(fpriv, handle);
                handle = 0;