drm: mediatek: fixup drm_gem_object_lookup API change
authorArnd Bergmann <arnd@arndb.de>
Wed, 18 May 2016 16:07:31 +0000 (18:07 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 May 2016 17:16:16 +0000 (19:16 +0200)
The drm_gem_object_lookup() function prototype changed while this
driver was added, so it fails to build now:

drivers/gpu/drm/mediatek/mtk_drm_gem.c: In function 'mtk_drm_gem_dumb_map_offset':
drivers/gpu/drm/mediatek/mtk_drm_gem.c:142:30: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types]
  obj = drm_gem_object_lookup(dev, file_priv, handle);

This fixes the new caller as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a8ad0bd84f98 ("drm: Remove unused drm_device from drm_gem_object_lookup()")
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1463587653-3035181-4-git-send-email-arnd@arndb.de
drivers/gpu/drm/mediatek/mtk_drm_fb.c
drivers/gpu/drm/mediatek/mtk_drm_gem.c

index 33d30c1..147df85 100644 (file)
@@ -138,7 +138,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev,
        if (drm_format_num_planes(cmd->pixel_format) != 1)
                return ERR_PTR(-EINVAL);
 
-       gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
+       gem = drm_gem_object_lookup(file, cmd->handles[0]);
        if (!gem)
                return ERR_PTR(-ENOENT);
 
index a773bfa..fa2ec0c 100644 (file)
@@ -139,7 +139,7 @@ int mtk_drm_gem_dumb_map_offset(struct drm_file *file_priv,
        struct drm_gem_object *obj;
        int ret;
 
-       obj = drm_gem_object_lookup(dev, file_priv, handle);
+       obj = drm_gem_object_lookup(file_priv, handle);
        if (!obj) {
                DRM_ERROR("failed to lookup gem object.\n");
                return -EINVAL;