From: matthias.bgg@gmail•com (Matthias Brugger)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change
Date: Thu, 19 May 2016 16:56:30 +0200 [thread overview]
Message-ID: <573DD41E.3050506@gmail.com> (raw)
In-Reply-To: <1463587653-3035181-4-git-send-email-arnd@arndb.de>
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>
next prev parent reply other threads:[~2016-05-19 14:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 16:07 [PATCH 0/5] drm: fixes for merge-window regressions Arnd Bergmann
2016-05-18 16:07 ` [PATCH 1/5] headers_check: don't warn about c++ guards Arnd Bergmann
2016-05-18 20:20 ` Emil Velikov
2016-05-18 16:07 ` [PATCH 2/5] drm: mediatek: add CONFIG_OF dependency Arnd Bergmann
2016-05-19 14:55 ` Matthias Brugger
2016-05-18 16:07 ` [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change Arnd Bergmann
2016-05-19 14:56 ` Matthias Brugger [this message]
2016-05-18 16:07 ` [PATCH 4/5] drm: exynos: mark pm functions as __maybe_unused Arnd Bergmann
2016-05-18 16:07 ` [PATCH 5/5] drm: remove unused dev variables Arnd Bergmann
2016-05-18 17:17 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=573DD41E.3050506@gmail.com \
--to=matthias.bgg@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox