From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree Date: Wed, 30 Jan 2019 10:22:08 +0200 Message-ID: <87k1im8si7.fsf@intel.com> References: <20190130093830.728e9d06@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lucas De Marchi , Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List List-Id: linux-next.vger.kernel.org T24gVHVlLCAyOSBKYW4gMjAxOSwgTHVjYXMgRGUgTWFyY2hpIDxsdWNhcy5kZS5tYXJjaGlAZ21h aWwuY29tPiB3cm90ZToKPiBPbiBUdWUsIEphbiAyOSwgMjAxOSBhdCAyOjM5IFBNIFN0ZXBoZW4g Um90aHdlbGwgPHNmckBjYW5iLmF1dWcub3JnLmF1PiB3cm90ZToKPj4KPj4gSGkgYWxsLAo+Pgo+ PiBBZnRlciBtZXJnaW5nIHRoZSBkcm0taW50ZWwtZml4ZXMgdHJlZSwgdG9kYXkncyBsaW51eC1u ZXh0IGJ1aWxkICh4ODZfNjQKPj4gYWxsbW9kY29uZmlnKSBmYWlsZWQgbGlrZSB0aGlzOgo+Pgo+ PiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmM6IEluIGZ1bmN0aW9uICdoYXNf Ym9ndXNfZHBsbF9jb25maWcnOgo+PiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmM6MTU0MzI6Mjc6IGVycm9yOiBtYWNybyAiSVNfR0VOIiByZXF1aXJlcyAzIGFyZ3VtZW50cywg YnV0IG9ubHkgMiBnaXZlbgo+PiAgIHJldHVybiBJU19HRU4oZGV2X3ByaXYsIDYpICYmCj4+ICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF4KPj4KPj4gQ2F1c2VkIGJ5IGNvbW1pdAo+Pgo+PiAg IGE0OWExNzIyNmZlYiAoImRybS9pOTE1OiBUcnkgdG8gc2FuaXRpemUgYm9ndXMgRFBMTCBzdGF0 ZSBsZWZ0IG92ZXIgYnkgYnJva2VuIFNOQiBCSU9TZW4iKQo+Pgo+PiBJdCBzZWVtcyB0aGlzIHdh cyBjaGVycnktcGlja2VkIGluY29ycmVjdGx5IDotKAo+Cj4gd2hpbGUgdGhlIGNoZXJyeS1waWNr IHdhcyBjb3JyZWN0LCB0aGUgbWFjcm8gaXMgZGlmZmVyZW50IG9uCj4gZHJtLWludGVsLWZpeGVz LiBJU19HRU4oZGV2X3ByaXYsIDYpIG5lZWRzIHRvIGJlIGNvbnZlcnRlZCB0bwo+IElTX0dFTjYo ZGV2X3ByaXYpLgo+Cj4gTHVjYXMgRGUgTWFyY2hpCj4KPj4KPj4gSSBoYXZlIHJldmVydGVkIHRo YXQgY29tbWl0IGZvciB0b2RheS4KCkRyb3BwZWQgdGhlIGNvbW1pdCBmcm9tIGRybS1pbnRlbC1m aXhlcy4KClNvbWVob3cgSSBoYWQgbWFuYWdlZCB0byBzY3JldyB1cCBteSBrZXJuZWwgY29uZmln IGluIGEgd2F5IHRoYXQgYXZvaWRlZAp0aGUgYnVpbGQgZmFpbHVyZS4KCkJSLApKYW5pLgoKLS0g CkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBHcmFwaGljcyBDZW50ZXIKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6ED7C282D6 for ; Wed, 30 Jan 2019 08:21:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B52A72087F for ; Wed, 30 Jan 2019 08:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730208AbfA3IVl (ORCPT ); Wed, 30 Jan 2019 03:21:41 -0500 Received: from mga18.intel.com ([134.134.136.126]:7170 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725834AbfA3IVj (ORCPT ); Wed, 30 Jan 2019 03:21:39 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jan 2019 00:21:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,540,1539673200"; d="scan'208";a="142632488" Received: from pusl-mobl4.ger.corp.intel.com (HELO localhost) ([10.249.46.78]) by fmsmga001.fm.intel.com with ESMTP; 30 Jan 2019 00:21:34 -0800 From: Jani Nikula To: Lucas De Marchi , Stephen Rothwell Cc: Daniel Vetter , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20190130093830.728e9d06@canb.auug.org.au> Date: Wed, 30 Jan 2019 10:22:08 +0200 Message-ID: <87k1im8si7.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Jan 2019, Lucas De Marchi wrote: > On Tue, Jan 29, 2019 at 2:39 PM Stephen Rothwell wrote: >> >> Hi all, >> >> After merging the drm-intel-fixes tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> drivers/gpu/drm/i915/intel_display.c: In function 'has_bogus_dpll_config': >> drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given >> return IS_GEN(dev_priv, 6) && >> ^ >> >> Caused by commit >> >> a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen") >> >> It seems this was cherry-picked incorrectly :-( > > while the cherry-pick was correct, the macro is different on > drm-intel-fixes. IS_GEN(dev_priv, 6) needs to be converted to > IS_GEN6(dev_priv). > > Lucas De Marchi > >> >> I have reverted that commit for today. Dropped the commit from drm-intel-fixes. Somehow I had managed to screw up my kernel config in a way that avoided the build failure. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center