Merge tag 'topic/drm-misc-2016-05-18' of git://anongit.freedesktop.org/drm-intel into drm-next

Update drm-misc pull with a few more fixes included, plus the two from
Arnd for the fallout from the drm_gem_object_lookup() refactor that I
failed to spot :(

* tag 'topic/drm-misc-2016-05-18' of git://anongit.freedesktop.org/drm-intel:
  drm: remove unused dev variables
  drm: mediatek: fixup drm_gem_object_lookup API change
  drm/tegra: Fix crash caused by reference count imbalance
  drm: Fix error handling in drm_connector_register
  drm: Avoid connector reference imbalance on error path
  drm/fb_helper: Fix references to dev->mode_config.num_connector
  drm/i915/fbdev: Fix num_connector references in intel_fb_initial_config()
  qxl: catch qxlfb_create_pinned_object failures
  drm/exynos/hdmi: add a missing tab
  drm/fb-cma-helper: Add function drm_fb_cma_create_with_funcs()
  drm/fb-cma-helper: Use const for drm_framebuffer_funcs argument
  drm: Drop connector argument from __drm_atomic_helper_connector_destroy_state
  drm: Drop plane argument from __drm_atomic_helper_plane_destroy_state
  drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state
  drm: Remove unused drm_device from drm_gem_object_lookup()

7 files changed, 11 insertions, 12 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index 35d0856738ae..823bf5e0b0c8 100644
--- 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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 2bbeeb07c187..9bc8f1d99733 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -92,8 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
 {
         struct drm_gem_object *gobj;
 
-        gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
-                                     data->handle);
+        gobj = drm_gem_object_lookup(p->filp, data->handle);
         if (gobj == NULL)
                 return -EINVAL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 726803069fef..b0832da2ef7e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -563,7 +563,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
         struct amdgpu_framebuffer *amdgpu_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (obj ==  NULL) {
                 dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
                         "can't create framebuffer\n", mode_cmd->handles[0]);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index c68f4cacaa85..8fab6486064f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -338,7 +338,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
         struct drm_gem_object *gobj;
         struct amdgpu_bo *robj;
 
-        gobj = drm_gem_object_lookup(dev, filp, handle);
+        gobj = drm_gem_object_lookup(filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -402,7 +402,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         int r = 0;
         long ret;
 
-        gobj = drm_gem_object_lookup(dev, filp, handle);
+        gobj = drm_gem_object_lookup(filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -436,7 +436,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
         int r = -1;
 
         DRM_DEBUG("%d \n", args->handle);
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         robj = gem_to_amdgpu_bo(gobj);
@@ -584,7 +584,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         rbo = gem_to_amdgpu_bo(gobj);
@@ -646,7 +646,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
         struct amdgpu_bo *robj;
         int r;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index be1cf388c2ec..8227344d2ff6 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 1e0988572a2f..c11b6007af80 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2605,7 +2605,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index c087f930d67e..3fb65e41a6ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;