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); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Tue, 8 Sep 2015 06:48:34 +0200 Message-ID: <55EE68A2.3020509@linux.intel.com> References: <20150903104919.6419ad18@canb.auug.org.au> <20150908094249.5cb1267e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150908094249.5cb1267e@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone List-Id: linux-next.vger.kernel.org T3AgMDgtMDktMTUgb20gMDE6NDIgc2NocmVlZiBTdGVwaGVuIFJvdGh3ZWxsOgo+IEhpIGFsbCwK Pgo+IE9uIFRodSwgMyBTZXAgMjAxNSAxMDo0OToxOSArMTAwMCBTdGVwaGVuIFJvdGh3ZWxsIDxz ZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4+IEFmdGVyIG1lcmdpbmcgdGhlIGRybS1taXNj IHRyZWUsIHRvZGF5J3MgbGludXgtbmV4dCBidWlsZCAoYXJtCj4+IG11bHRpX3Y3X2RlZmNvbmZp ZykgZmFpbGVkIGxpa2UgdGhpczoKPj4KPj4gZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9t ZHA1X3BsYW5lLmM6IEluIGZ1bmN0aW9uICdtZHA1X3BsYW5lX2NsZWFudXBfZmInOgo+PiBkcml2 ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYzoyNzI6MjY6IGVycm9yOiAnZmIn IHJlZGVjbGFyZWQgYXMgZGlmZmVyZW50IGtpbmQgb2Ygc3ltYm9sCj4+ICAgc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIgPSBvbGRfc3RhdGUtPmZiOwo+PiAgICAgICAgICAgICAgICAgICAgICAg ICAgIF4KPj4gZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X3BsYW5lLmM6MjY3OjI3 OiBub3RlOiBwcmV2aW91cyBkZWZpbml0aW9uIG9mICdmYicgd2FzIGhlcmUKPj4gICAgc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4KPj4g ZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X3BsYW5lLmM6IEF0IHRvcCBsZXZlbDoK Pj4gZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X3BsYW5lLmM6MzgzOjM6IHdhcm5p bmc6IGluaXRpYWxpemF0aW9uIGZyb20gaW5jb21wYXRpYmxlIHBvaW50ZXIgdHlwZQo+PiAgICAu Y2xlYW51cF9mYiA9IG1kcDVfcGxhbmVfY2xlYW51cF9mYiwKPj4gICAgXgo+PiBkcml2ZXJzL2dw dS9kcm0vbXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYzozODM6Mzogd2FybmluZzogKG5lYXIgaW5p dGlhbGl6YXRpb24gZm9yICdtZHA1X3BsYW5lX2hlbHBlcl9mdW5jcy5jbGVhbnVwX2ZiJykKPj4K Pj4gQ2F1c2VkIGJ5IGNvbW1pdAo+Pgo+PiAgIGEzMTcyOTBhZjBkYiAoImRybS9hdG9taWM6IE1h a2UgcHJlcGFyZV9mYi9jbGVhbnVwX2ZiIG9ubHkgdGFrZSBzdGF0ZSwgdjMiKQo+Pgo+PiBXZWxs LCB0aGF0IHdhcyBjbGVhcmx5IG5ldmVyIGJ1aWxkIHRlc3RlZCA6LSgKPj4KPj4gSSBoYXZlIHVz ZWQgdGhlIGRybS1taXNjIHRyZWUgZnJvbSBuZXh0LTIwMTUwOTAyIGZvciB0b2RheS4KPiBUaGlz IGlzIHN0aWxsIGluIHRvZGF5J3MgbGludXgtbmV4dCA6LSgKPgpJIGp1c3QgZ290IGFyb3VuZCB0 byBtYWtpbmcgYW4gYW1lbmQgZml4IHBhdGNoIGZvciBpdCB5ZXN0ZXJkYXkuIENhbiB5b3UgZm9s ZCBpdCBpbnRvIHYzIGRhbmllbD8KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21k cC9tZHA1L21kcDVfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9w bGFuZS5jCmluZGV4IDRkMzkwYjY5OWU5YS4uYTBmNWZmMGNlOGRjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vbXNtL21kcC9tZHA1L21kcDVfcGxhbmUuYwpAQCAtMjY0LDcgKzI2NCw2IEBAIHN0YXRpYyBp bnQgbWRwNV9wbGFuZV9wcmVwYXJlX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogfQogCiBz dGF0aWMgdm9pZCBtZHA1X3BsYW5lX2NsZWFudXBfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs Ci0JCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3RydWN0IG1kcDVfcGxhbmUgKm1kcDVfcGxhbmUgPSB0 b19tZHA1X3BsYW5lKHBsYW5lKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==