next-20160518 build: 2 failures 20 warnings (next-20160518)

Commit Message

Chris Wilson May 18, 2016, 10:23 a.m. UTC

On Wed, May 18, 2016 at 11:15:59AM +0100, Mark Brown wrote:
> On Wed, May 18, 2016 at 08:05:26AM +0100, Build bot for Mark Brown wrote:
> 
> Today's -next fails to build arm and arm64 allmodconfigs fail to build
> due to:
> 
> > 	arm64-allmodconfig
> > 	arm-allmodconfig
> > ../drivers/gpu/drm/mediatek/mtk_drm_fb.c:141:30: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > ../drivers/gpu/drm/mediatek/mtk_drm_fb.c:141:8: error: too many arguments to function 'drm_gem_object_lookup'
> > ../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]
> > ../drivers/gpu/drm/mediatek/mtk_drm_gem.c:142:8: error: too many arguments to function 'drm_gem_object_lookup'
> 
> Apparently triggered by 8ad0bd84f98607 (drm: Remove unused drm_device
> from drm_gem_object_lookup()) which didn't update the Mediatek drivers.

I'm pretty sure they didn't exist when I wrote the patch!


-Chris

Comments

Stephen Rothwell May 19, 2016, midnight UTC | #1

Hi Chris,

On Wed, 18 May 2016 11:23:57 +0100 Chris Wilson <[e-mail]> wrote:
>
> I'm pretty sure they didn't exist when I wrote the patch!

Yeah, but they do in the drm-misc tree where your patch was applied ...
so someone should do a fix patch to be applied to that tree.  In the
mean time, I will apply the below as a merge fix in linux-next.

> 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;

Patch

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;