[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_crtc.c  |    2 +-
 drivers/gpu/drm/openchrome/via_drv.c   |    2 +-
 drivers/gpu/drm/openchrome/via_fb.c    |    2 +-
 drivers/gpu/drm/openchrome/via_ioc32.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1b6528d56b31c71a2591198800a26e700d0fbc66
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 4 05:16:18 2017 -0700

    Change to drm_gem_object_lookup() input parameter
    
    Commit a8ad0bd84f986072314595d05444719fdf29e412 made this change,
    so our side needs to change as well.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index bf71b5f349d6..ea282ba7231c 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -252,7 +252,7 @@ via_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
         return -EINVAL;
     }
 
-    obj = drm_gem_object_lookup(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,
                 crtc->base.id);
diff --git a/drivers/gpu/drm/openchrome/via_drv.c b/drivers/gpu/drm/openchrome/via_drv.c
index 66302fac4263..f507d2cc2a90 100644
--- a/drivers/gpu/drm/openchrome/via_drv.c
+++ b/drivers/gpu/drm/openchrome/via_drv.c
@@ -218,7 +218,7 @@ static int via_dumb_mmap(struct drm_file *filp, struct drm_device *dev,
 	struct drm_gem_object *obj;
 	int rc = -ENOENT;
 
-	obj = drm_gem_object_lookup(dev, filp, handle);
+	obj = drm_gem_object_lookup(filp, handle);
 	if (obj == NULL)
 		return rc;
 
diff --git a/drivers/gpu/drm/openchrome/via_fb.c b/drivers/gpu/drm/openchrome/via_fb.c
index d0a80db69ea6..ebc5822a0dfe 100644
--- a/drivers/gpu/drm/openchrome/via_fb.c
+++ b/drivers/gpu/drm/openchrome/via_fb.c
@@ -960,7 +960,7 @@ via_user_framebuffer_create(struct drm_device *dev,
 	struct drm_gem_object *obj;
 	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) {
 		DRM_ERROR("No GEM object found for handle 0x%08X\n",
 				mode_cmd->handles[0]);
diff --git a/drivers/gpu/drm/openchrome/via_ioc32.c b/drivers/gpu/drm/openchrome/via_ioc32.c
index 8b44bd4bb0df..d37e99b080b1 100644
--- a/drivers/gpu/drm/openchrome/via_ioc32.c
+++ b/drivers/gpu/drm/openchrome/via_ioc32.c
@@ -96,7 +96,7 @@ via_gem_state(struct drm_device *dev, void *data, struct drm_file *file_priv)
 	struct ttm_placement placement;
 	int ret = -EINVAL;
 
-	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+	obj = drm_gem_object_lookup(file_priv, args->handle);
 	if (obj == NULL)
 		return ret;
 
@@ -139,7 +139,7 @@ via_gem_wait(struct drm_device *dev, void *data, struct drm_file *file_priv)
 	int ret = -EINVAL;
 	bool no_wait;
 
-	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+	obj = drm_gem_object_lookup(file_priv, args->handle);
 	if (obj == NULL)
 		return ret;