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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 19 May 2016 10:00:08 +1000

Hi Chris,

On Wed, 18 May 2016 11:23:57 +0100 Chris Wilson <[email-masked]> 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;

-- 
Cheers,
Stephen Rothwell