lkml.org 
[lkml]   [2015]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the drm-misc tree
On Tue, Sep 08, 2015 at 06:48:34AM +0200, Maarten Lankhorst wrote:
> Op 08-09-15 om 01:42 schreef Stephen Rothwell:
> > Hi all,
> >
> > On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> After merging the drm-misc tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
> >> struct drm_framebuffer *fb = old_state->fb;
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
> >> struct drm_framebuffer *fb,
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
> >> .cleanup_fb = mdp5_plane_cleanup_fb,
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
> >>
> >> Caused by commit
> >>
> >> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
> >>
> >> Well, that was clearly never build tested :-(
> >>
> >> I have used the drm-misc tree from next-20150902 for today.
> > This is still in today's linux-next :-(
> >
> I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel?

Squashed in, thanks.
-Daniel

>
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 4d390b699e9a..a0f5ff0ce8dc 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
> }
>
> static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
> - struct drm_framebuffer *fb,
> const struct drm_plane_state *old_state)
> {
> struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
>

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


\
 
 \ /
  Last update: 2015-09-08 10:41    [W:0.039 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site