From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083AbbIHEtD (ORCPT ); Tue, 8 Sep 2015 00:49:03 -0400 Received: from mga03.intel.com ([134.134.136.65]:12690 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbbIHEsi (ORCPT ); Tue, 8 Sep 2015 00:48:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,487,1437462000"; d="scan'208";a="800372620" Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20150903104919.6419ad18@canb.auug.org.au> <20150908094249.5cb1267e@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone From: Maarten Lankhorst Message-ID: <55EE68A2.3020509@linux.intel.com> Date: Tue, 8 Sep 2015 06:48:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <20150908094249.5cb1267e@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? 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);