Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1403794

Re: [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change

Show all headers | View raw

On 18/05/16 18:07, Arnd Bergmann wrote:
> 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()")
> ---
>   drivers/gpu/drm/mediatek/mtk_drm_fb.c  | 2 +-
>   drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +-
>   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,
>   	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);
>
> 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,
>   	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;
>

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] drm: fixes for merge-window regressions Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:10 +0200
  [PATCH 1/5] headers_check: don't warn about c++ guards Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:10 +0200
    Re: [PATCH 1/5] headers_check: don't warn about c++ guards Emil Velikov <emil.l.velikov@gmail.com> - 2016-05-18 22:30 +0200
  [PATCH 4/5] drm: exynos: mark pm functions as __maybe_unused Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:10 +0200
  [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:10 +0200
    Re: [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change Matthias Brugger <matthias.bgg@gmail.com> - 2016-05-19 17:00 +0200
  [PATCH 5/5] drm: remove unused dev variables Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:10 +0200
    Re: [PATCH 5/5] drm: remove unused dev variables Daniel Vetter <daniel@ffwll.ch> - 2016-05-18 19:20 +0200
  [PATCH 2/5] drm: mediatek: add CONFIG_OF dependency Arnd Bergmann <arnd@arndb.de> - 2016-05-18 18:20 +0200
    Re: [PATCH 2/5] drm: mediatek: add CONFIG_OF dependency Matthias Brugger <matthias.bgg@gmail.com> - 2016-05-19 17:00 +0200

csiph-web