From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] i915: fix build on gcc7 Date: Thu, 01 Jun 2017 14:53:51 +0300 Message-ID: <87tw3zj54g.fsf@intel.com> References: <20170601114019.30517-1-asarai@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170601114019.30517-1-asarai@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , David Airlie Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Aleksa Sarai List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAwMSBKdW4gMjAxNywgQWxla3NhIFNhcmFpIDxhc2FyYWlAc3VzZS5kZT4gd3JvdGU6 Cj4gV2l0aCBnY2M3LCB0aGUgY29uZGl0aW9uYWwgdXNhZ2Ugb2YgKHBvcnQgPT0gUE9SVF9BID8g UE9SVF9DIDogUE9SVF9BKQo+IHRyaWdnZXJzIC1XZXJyb3I9aW50LWluLWJvb2wtY29udGV4dCB3 aGljaCBicmVha3MgdGhlIGJ1aWxkLiBJbnN0ZWFkLAo+IHVzZSBhIHRlbXBvcmFyeSBwb3J0X290 aGVyIHZhcmlhYmxlIHRoYXQgYXZvaWRzIGhpdHRpbmcgdGhpcyBlcnJvci4KPgo+ICAgJSBnY2Mg LS12ZXJzaW9uCj4gICBnY2MgKFNVU0UgTGludXgpIDcuMS4xIDIwMTcwNTE3IFtnY2MtNy1icmFu Y2ggcmV2aXNpb24gMjQ4MTUyXQo+ICAgQ29weXJpZ2h0IChDKSAyMDE3IEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbiwgSW5jLgo+ICAgVGhpcyBpcyBmcmVlIHNvZnR3YXJlOyBzZWUgdGhlIHNvdXJj ZSBmb3IgY29weWluZyBjb25kaXRpb25zLiAgVGhlcmUgaXMgTk8KPiAgIHdhcnJhbnR5OyBub3Qg ZXZlbiBmb3IgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQ T1NFLgo+ICAgJSBtYWtlIC1qOCBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kubwo+ICAg SW4gZmlsZSBpbmNsdWRlZCBmcm9tIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jOjM0 OjA6Cj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYzogSW4gZnVuY3Rpb24g4oCY aW50ZWxfZHNpX3ByZXBhcmXigJk6Cj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2ku YzoxNDg3OjIzOiBlcnJvcjogPzogdXNpbmcgaW50ZWdlciBjb25zdGFudHMgaW4gYm9vbGVhbiBj b250ZXh0IFstV2Vycm9yPWludC1pbi1ib29sLWNvbnRleHRdCj4gICAgICAgICAgUE9SVF9BID8g UE9SVF9DIDogUE9SVF9BKSwKPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmg6Mzkw OTo3Njogbm90ZTogaW4gZGVmaW5pdGlvbiBvZiBtYWNybyDigJhJOTE1X1dSSVRF4oCZCj4gICAg I2RlZmluZSBJOTE1X1dSSVRFKHJlZywgdmFsKSBkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLm1taW9f d3JpdGVsKGRldl9wcml2LCAocmVnKSwgKHZhbCksIHRydWUpCj4gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXn5+Cj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oOjgyODA6MzI6IG5vdGU6 IGluIGV4cGFuc2lvbiBvZiBtYWNybyDigJhfTU1JT+KAmQo+ICAgICNkZWZpbmUgX01NSU9fTUlQ SShwb3J0LCBhLCBjKSBfTU1JTyhfTUlQSV9QT1JUKHBvcnQsIGEsIGMpKQo+ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBefn5+fgo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaDo4MjgwOjM4OiBub3RlOiBpbiBleHBhbnNpb24gb2YgbWFjcm8g4oCYX01JUElfUE9S VOKAmQo+ICAgICNkZWZpbmUgX01NSU9fTUlQSShwb3J0LCBhLCBjKSBfTU1JTyhfTUlQSV9QT1JU KHBvcnQsIGEsIGMpKQo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBe fn5+fn5+fn5+Cj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oOjg2MjQ6MzI6IG5v dGU6IGluIGV4cGFuc2lvbiBvZiBtYWNybyDigJhfTU1JT19NSVBJ4oCZCj4gICAgI2RlZmluZSBN SVBJX0lOSVRfQ09VTlQocG9ydCkgIF9NTUlPX01JUEkocG9ydCwgX01JUElBX0lOSVRfQ09VTlQs IF9NSVBJQ19JTklUX0NPVU5UKQo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBe fn5+fn5+fn5+Cj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYzoxNDg2OjE1OiBu b3RlOiBpbiBleHBhbnNpb24gb2YgbWFjcm8g4oCYTUlQSV9JTklUX0NPVU5U4oCZCj4gICAgICAg STkxNV9XUklURShNSVBJX0lOSVRfQ09VTlQocG9ydCA9PQo+ICAgICAgICAgICAgICAgICAgXn5+ fn5+fn5+fn5+fn5+Cj4KPiBTaWduZWQtb2ZmLWJ5OiBBbGVrc2EgU2FyYWkgPGFzYXJhaUBzdXNl LmRlPgoKVGhpcyBpcyBwcm9iYWJseSBhbHJlYWR5IGZpeGVkIGluIGRybS1uZXh0IGJ5Cgpjb21t aXQgMGFkNGRjODg3ZDQxNjg0NDhlOGM4MDFhYTRlZGQ4ZmUxZTBiZDUzNApBdXRob3I6IEhhbnMg ZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+CkRhdGU6ICAgVGh1IE1heSAxOCAxMzowNjo0 NCAyMDE3ICswMjAwCgogICAgZHJtL2k5MTU6IEZpeCBuZXcgLVdpbnQtaW4tYm9vbC1jb250ZXh0 IGdjYyBjb21waWxlciB3YXJuaW5nCgp3aGljaCBJIGFsc28gdGhpbmsgaXMgYSBtb3JlIHNlbnNp YmxlIGZpeCB0aGFuIHRoaXMgb25lLgoKQlIsCkphbmkuCgoKPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpLmMgfCA1ICsrKy0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwo+IGlu ZGV4IDU0MDMwYjY4NDA2YS4uNTNlNzE3ZTdiODExIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RzaS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHNpLmMKPiBAQCAtMTQ3NiwxNCArMTQ3NiwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfcHJl cGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKPiAgCQkJCXR4Y2xrZXNj KGludGVsX2RzaS0+ZXNjYXBlX2Nsa19kaXYsIDEwMCkpOwo+ICAKPiAgCQlpZiAoSVNfR0VOOV9M UChkZXZfcHJpdikgJiYgKCFpbnRlbF9kc2ktPmR1YWxfbGluaykpIHsKPiArCQkJZW51bSBwb3J0 IHBvcnRfb3RoZXIgPSBwb3J0ID09IFBPUlRfQSA/IFBPUlRfQyA6IFBPUlRfQTsKPiArCj4gIAkJ CS8qCj4gIAkJCSAqIEJYVCBzcGVjIHNheXMgd3JpdGUgTUlQSV9JTklUX0NPVU5UIGZvcgo+ICAJ CQkgKiBib3RoIHRoZSBwb3J0cywgZXZlbiBpZiBvbmx5IG9uZSBpcwo+ICAJCQkgKiBnZXR0aW5n IHVzZWQuIFNvIHdyaXRlIHRoZSBvdGhlciBwb3J0Cj4gIAkJCSAqIGlmIG5vdCBpbiBkdWFsIGxp bmsgbW9kZS4KPiAgCQkJICovCj4gLQkJCUk5MTVfV1JJVEUoTUlQSV9JTklUX0NPVU5UKHBvcnQg PT0KPiAtCQkJCQkJUE9SVF9BID8gUE9SVF9DIDogUE9SVF9BKSwKPiArCQkJSTkxNV9XUklURShN SVBJX0lOSVRfQ09VTlQocG9ydF9vdGhlciksCj4gIAkJCQkJaW50ZWxfZHNpLT5pbml0X2NvdW50 KTsKPiAgCQl9CgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kg Q2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751140AbdFALua convert rfc822-to-8bit (ORCPT ); Thu, 1 Jun 2017 07:50:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:45669 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751058AbdFALu3 (ORCPT ); Thu, 1 Jun 2017 07:50:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,279,1493708400"; d="scan'208";a="863496855" From: Jani Nikula To: Aleksa Sarai , Daniel Vetter , David Airlie Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Aleksa Sarai Subject: Re: [PATCH] i915: fix build on gcc7 In-Reply-To: <20170601114019.30517-1-asarai@suse.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20170601114019.30517-1-asarai@suse.de> Date: Thu, 01 Jun 2017 14:53:51 +0300 Message-ID: <87tw3zj54g.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 01 Jun 2017, Aleksa Sarai wrote: > With gcc7, the conditional usage of (port == PORT_A ? PORT_C : PORT_A) > triggers -Werror=int-in-bool-context which breaks the build. Instead, > use a temporary port_other variable that avoids hitting this error. > > % gcc --version > gcc (SUSE Linux) 7.1.1 20170517 [gcc-7-branch revision 248152] > Copyright (C) 2017 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > % make -j8 drivers/gpu/drm/i915/intel_dsi.o > In file included from drivers/gpu/drm/i915/intel_dsi.c:34:0: > drivers/gpu/drm/i915/intel_dsi.c: In function ‘intel_dsi_prepare’: > drivers/gpu/drm/i915/intel_dsi.c:1487:23: error: ?: using integer constants in boolean context [-Werror=int-in-bool-context] > PORT_A ? PORT_C : PORT_A), > drivers/gpu/drm/i915/i915_drv.h:3909:76: note: in definition of macro ‘I915_WRITE’ > #define I915_WRITE(reg, val) dev_priv->uncore.funcs.mmio_writel(dev_priv, (reg), (val), true) > ^~~ > drivers/gpu/drm/i915/i915_reg.h:8280:32: note: in expansion of macro ‘_MMIO’ > #define _MMIO_MIPI(port, a, c) _MMIO(_MIPI_PORT(port, a, c)) > ^~~~~ > drivers/gpu/drm/i915/i915_reg.h:8280:38: note: in expansion of macro ‘_MIPI_PORT’ > #define _MMIO_MIPI(port, a, c) _MMIO(_MIPI_PORT(port, a, c)) > ^~~~~~~~~~ > drivers/gpu/drm/i915/i915_reg.h:8624:32: note: in expansion of macro ‘_MMIO_MIPI’ > #define MIPI_INIT_COUNT(port) _MMIO_MIPI(port, _MIPIA_INIT_COUNT, _MIPIC_INIT_COUNT) > ^~~~~~~~~~ > drivers/gpu/drm/i915/intel_dsi.c:1486:15: note: in expansion of macro ‘MIPI_INIT_COUNT’ > I915_WRITE(MIPI_INIT_COUNT(port == > ^~~~~~~~~~~~~~~ > > Signed-off-by: Aleksa Sarai This is probably already fixed in drm-next by commit 0ad4dc887d4168448e8c801aa4edd8fe1e0bd534 Author: Hans de Goede Date: Thu May 18 13:06:44 2017 +0200 drm/i915: Fix new -Wint-in-bool-context gcc compiler warning which I also think is a more sensible fix than this one. BR, Jani. > --- > drivers/gpu/drm/i915/intel_dsi.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 54030b68406a..53e717e7b811 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -1476,14 +1476,15 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder, > txclkesc(intel_dsi->escape_clk_div, 100)); > > if (IS_GEN9_LP(dev_priv) && (!intel_dsi->dual_link)) { > + enum port port_other = port == PORT_A ? PORT_C : PORT_A; > + > /* > * BXT spec says write MIPI_INIT_COUNT for > * both the ports, even if only one is > * getting used. So write the other port > * if not in dual link mode. > */ > - I915_WRITE(MIPI_INIT_COUNT(port == > - PORT_A ? PORT_C : PORT_A), > + I915_WRITE(MIPI_INIT_COUNT(port_other), > intel_dsi->init_count); > } -- Jani Nikula, Intel Open Source Technology Center