aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-18 12:07:31 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-18 13:16:16 -0400
commitde4ae068ebf599f46ddfc5f8541a302226230267 (patch)
tree39e9be066e229c759962a7ebd6dd9c8b85e9b2e6
parent280dc0e145b2b04fd1b414e512118ce6eb9b93e8 (diff)
drm: mediatek: fixup drm_gem_object_lookup API change
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
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_fb.c2
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_gem.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
index 33d30c19f35f..147df85399ab 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
@@ -138,7 +138,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev,
138 if (drm_format_num_planes(cmd->pixel_format) != 1) 138 if (drm_format_num_planes(cmd->pixel_format) != 1)
139 return ERR_PTR(-EINVAL); 139 return ERR_PTR(-EINVAL);
140 140
141 gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); 141 gem = drm_gem_object_lookup(file, cmd->handles[0]);
142 if (!gem) 142 if (!gem)
143 return ERR_PTR(-ENOENT); 143 return ERR_PTR(-ENOENT);
144 144
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index a773bfaea913..fa2ec0cd00e8 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -139,7 +139,7 @@ int mtk_drm_gem_dumb_map_offset(struct drm_file *file_priv,
139 struct drm_gem_object *obj; 139 struct drm_gem_object *obj;
140 int ret; 140 int ret;
141 141
142 obj = drm_gem_object_lookup(dev, file_priv, handle); 142 obj = drm_gem_object_lookup(file_priv, handle);
143 if (!obj) { 143 if (!obj) {
144 DRM_ERROR("failed to lookup gem object.\n"); 144 DRM_ERROR("failed to lookup gem object.\n");
145 return -EINVAL; 145 return -EINVAL;