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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Tue, 8 Sep 2015 10:16:17 +0200 Message-ID: <20150908081617.GH32505@phenom.ffwll.local> 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="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <55EE68A2.3020509@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: Stephen Rothwell , Daniel Stone , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org List-Id: linux-next.vger.kernel.org T24gVHVlLCBTZXAgMDgsIDIwMTUgYXQgMDY6NDg6MzRBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT3AgMDgtMDktMTUgb20gMDE6NDIgc2NocmVlZiBTdGVwaGVuIFJvdGh3ZWxs Ogo+ID4gSGkgYWxsLAo+ID4KPiA+IE9uIFRodSwgMyBTZXAgMjAxNSAxMDo0OToxOSArMTAwMCBT dGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4gPj4gQWZ0ZXIg bWVyZ2luZyB0aGUgZHJtLW1pc2MgdHJlZSwgdG9kYXkncyBsaW51eC1uZXh0IGJ1aWxkIChhcm0K PiA+PiBtdWx0aV92N19kZWZjb25maWcpIGZhaWxlZCBsaWtlIHRoaXM6Cj4gPj4KPiA+PiBkcml2 ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYzogSW4gZnVuY3Rpb24gJ21kcDVf cGxhbmVfY2xlYW51cF9mYic6Cj4gPj4gZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1 X3BsYW5lLmM6MjcyOjI2OiBlcnJvcjogJ2ZiJyByZWRlY2xhcmVkIGFzIGRpZmZlcmVudCBraW5k IG9mIHN5bWJvbAo+ID4+ICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBvbGRfc3RhdGUt PmZiOwo+ID4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgXgo+ID4+IGRyaXZlcnMvZ3B1L2Ry bS9tc20vbWRwL21kcDUvbWRwNV9wbGFuZS5jOjI2NzoyNzogbm90ZTogcHJldmlvdXMgZGVmaW5p dGlvbiBvZiAnZmInIHdhcyBoZXJlCj4gPj4gICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs Cj4gPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgXgo+ID4+IGRyaXZlcnMvZ3B1L2RybS9t c20vbWRwL21kcDUvbWRwNV9wbGFuZS5jOiBBdCB0b3AgbGV2ZWw6Cj4gPj4gZHJpdmVycy9ncHUv ZHJtL21zbS9tZHAvbWRwNS9tZHA1X3BsYW5lLmM6MzgzOjM6IHdhcm5pbmc6IGluaXRpYWxpemF0 aW9uIGZyb20gaW5jb21wYXRpYmxlIHBvaW50ZXIgdHlwZQo+ID4+ICAgIC5jbGVhbnVwX2ZiID0g bWRwNV9wbGFuZV9jbGVhbnVwX2ZiLAo+ID4+ICAgIF4KPiA+PiBkcml2ZXJzL2dwdS9kcm0vbXNt L21kcC9tZHA1L21kcDVfcGxhbmUuYzozODM6Mzogd2FybmluZzogKG5lYXIgaW5pdGlhbGl6YXRp b24gZm9yICdtZHA1X3BsYW5lX2hlbHBlcl9mdW5jcy5jbGVhbnVwX2ZiJykKPiA+Pgo+ID4+IENh dXNlZCBieSBjb21taXQKPiA+Pgo+ID4+ICAgYTMxNzI5MGFmMGRiICgiZHJtL2F0b21pYzogTWFr ZSBwcmVwYXJlX2ZiL2NsZWFudXBfZmIgb25seSB0YWtlIHN0YXRlLCB2MyIpCj4gPj4KPiA+PiBX ZWxsLCB0aGF0IHdhcyBjbGVhcmx5IG5ldmVyIGJ1aWxkIHRlc3RlZCA6LSgKPiA+Pgo+ID4+IEkg aGF2ZSB1c2VkIHRoZSBkcm0tbWlzYyB0cmVlIGZyb20gbmV4dC0yMDE1MDkwMiBmb3IgdG9kYXku Cj4gPiBUaGlzIGlzIHN0aWxsIGluIHRvZGF5J3MgbGludXgtbmV4dCA6LSgKPiA+Cj4gSSBqdXN0 IGdvdCBhcm91bmQgdG8gbWFraW5nIGFuIGFtZW5kIGZpeCBwYXRjaCBmb3IgaXQgeWVzdGVyZGF5 LiBDYW4geW91IGZvbGQgaXQgaW50byB2MyBkYW5pZWw/CgpTcXVhc2hlZCBpbiwgdGhhbmtzLgot RGFuaWVsCgo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21k cDVfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9wbGFuZS5jCj4g aW5kZXggNGQzOTBiNjk5ZTlhLi5hMGY1ZmYwY2U4ZGMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X3BsYW5lLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v bXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYwo+IEBAIC0yNjQsNyArMjY0LDYgQEAgc3RhdGljIGlu dCBtZHA1X3BsYW5lX3ByZXBhcmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gIH0KPiAg Cj4gIHN0YXRpYyB2b2lkIG1kcDVfcGxhbmVfY2xlYW51cF9mYihzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKPiAtCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKPiAgCQljb25zdCBzdHJ1Y3Qg ZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUpCj4gIHsKPiAgCXN0cnVjdCBtZHA1X3BsYW5lICpt ZHA1X3BsYW5lID0gdG9fbWRwNV9wbGFuZShwbGFuZSk7Cj4gCgotLSAKRGFuaWVsIFZldHRlcgpT b2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK