From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126AbbIHINk (ORCPT ); Tue, 8 Sep 2015 04:13:40 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:33633 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752AbbIHINg (ORCPT ); Tue, 8 Sep 2015 04:13:36 -0400 Date: Tue, 8 Sep 2015 10:16:17 +0200 From: Daniel Vetter To: Maarten Lankhorst Cc: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20150908081617.GH32505@phenom.ffwll.local> Mail-Followup-To: Maarten Lankhorst , Stephen Rothwell , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone References: <20150903104919.6419ad18@canb.auug.org.au> <20150908094249.5cb1267e@canb.auug.org.au> <55EE68A2.3020509@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55EE68A2.3020509@linux.intel.com> X-Operating-System: Linux phenom 4.1.0-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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