From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Date: Fri, 06 Jul 2018 05:46:43 +0000 Subject: [PATCH 4.17 22/46] drm/sti: Depend on OF rather than selecting it Message-Id: <20180706054525.666782487@linuxfoundation.org> List-Id: References: <20180706054524.595521988@linuxfoundation.org> In-Reply-To: <20180706054524.595521988@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Gaignard , Vincent Abriou , David Airlie , dri-devel@lists.freedesktop.org, linux-ia64@vger.kernel.org, Oliver OHalloran , Philippe Cornu 4.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver O'Halloran commit c9fea6f4379c72b7c59e1efceab09a35bc7eac43 upstream. Commit cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") reworked some code inside of this driver and made it select CONFIG_OF. This results in the entire OF layer being enabled when building an allmodconfig on ia64. OF on ia64 is completely unsupported so this isn't a great state of affairs. The 0day robot noticed a link-time failure on ia64 caused by using of_node_to_nid() in an otherwise unrelated driver. The generic fallback for of_node_to_nid() only exists when: defined(CONFIG_OF) && defined(CONFIG_NUMA) = false Since CONFIG_NUMA is usually selected for IA64 we get the link failure. Fix this by making the driver depend on OF rather than selecting it, odds are that was the original intent. Link: https://lists.01.org/pipermail/kbuild-all/2018-March/045172.html Fixes: cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") Cc: Benjamin Gaignard Cc: Vincent Abriou Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: linux-ia64@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Oliver O'Halloran Reviewed-by: Benjamin Gaignard Signed-off-by: Philippe Cornu Link: https://patchwork.freedesktop.org/patch/msgid/20180403053401.30045-1-oohall@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/sti/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -1,6 +1,6 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" - depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM) select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER @@ -8,6 +8,5 @@ config DRM_STI select DRM_PANEL select FW_LOADER select SND_SOC_HDMI_CODEC if SND_SOC - select OF help Choose this option to enable DRM on STM stiH4xx chipset From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.17 22/46] drm/sti: Depend on OF rather than selecting it Date: Fri, 6 Jul 2018 07:46:43 +0200 Message-ID: <20180706054525.666782487@linuxfoundation.org> References: <20180706054524.595521988@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF65B6E1A4 for ; Fri, 6 Jul 2018 05:47:58 +0000 (UTC) In-Reply-To: <20180706054524.595521988@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: linux-ia64@vger.kernel.org, David Airlie , Greg Kroah-Hartman , Philippe Cornu , dri-devel@lists.freedesktop.org, Oliver OHalloran , stable@vger.kernel.org, Vincent Abriou List-Id: dri-devel@lists.freedesktop.org NC4xNy1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBPbGl2ZXIgTydI YWxsb3JhbiA8b29oYWxsQGdtYWlsLmNvbT4KCmNvbW1pdCBjOWZlYTZmNDM3OWM3MmI3YzU5ZTFl ZmNlYWIwOWEzNWJjN2VhYzQzIHVwc3RyZWFtLgoKQ29tbWl0IGNjNmI3NDFjNmY2MyAoImRybTog c3RpOiByZW1vdmUgdXNlbGVzcyBmaWVsZHMgZnJvbSB2dGcKc3RydWN0dXJlIikgcmV3b3JrZWQg c29tZSBjb2RlIGluc2lkZSBvZiB0aGlzIGRyaXZlciBhbmQgbWFkZSBpdCBzZWxlY3QKQ09ORklH X09GLiBUaGlzIHJlc3VsdHMgaW4gdGhlIGVudGlyZSBPRiBsYXllciBiZWluZyBlbmFibGVkIHdo ZW4KYnVpbGRpbmcgYW4gYWxsbW9kY29uZmlnIG9uIGlhNjQuIE9GIG9uIGlhNjQgaXMgY29tcGxl dGVseSB1bnN1cHBvcnRlZApzbyB0aGlzIGlzbid0IGEgZ3JlYXQgc3RhdGUgb2YgYWZmYWlycy4K ClRoZSAwZGF5IHJvYm90IG5vdGljZWQgYSBsaW5rLXRpbWUgZmFpbHVyZSBvbiBpYTY0IGNhdXNl ZCBieQp1c2luZyBvZl9ub2RlX3RvX25pZCgpIGluIGFuIG90aGVyd2lzZSB1bnJlbGF0ZWQgZHJp dmVyLiBUaGUKZ2VuZXJpYyBmYWxsYmFjayBmb3Igb2Zfbm9kZV90b19uaWQoKSBvbmx5IGV4aXN0 cyB3aGVuOgoKCWRlZmluZWQoQ09ORklHX09GKSAmJiBkZWZpbmVkKENPTkZJR19OVU1BKSA9PSBm YWxzZQoKU2luY2UgQ09ORklHX05VTUEgaXMgdXN1YWxseSBzZWxlY3RlZCBmb3IgSUE2NCB3ZSBn ZXQgdGhlIGxpbmsgZmFpbHVyZS4KRml4IHRoaXMgYnkgbWFraW5nIHRoZSBkcml2ZXIgZGVwZW5k IG9uIE9GIHJhdGhlciB0aGFuIHNlbGVjdGluZyBpdCwKb2RkcyBhcmUgdGhhdCB3YXMgdGhlIG9y aWdpbmFsIGludGVudC4KCkxpbms6IGh0dHBzOi8vbGlzdHMuMDEub3JnL3BpcGVybWFpbC9rYnVp bGQtYWxsLzIwMTgtTWFyY2gvMDQ1MTcyLmh0bWwKRml4ZXM6IGNjNmI3NDFjNmY2MyAoImRybTog c3RpOiByZW1vdmUgdXNlbGVzcyBmaWVsZHMgZnJvbSB2dGcgc3RydWN0dXJlIikKQ2M6IEJlbmph bWluIEdhaWduYXJkIDxiZW5qYW1pbi5nYWlnbmFyZEBsaW5hcm8ub3JnPgpDYzogVmluY2VudCBB YnJpb3UgPHZpbmNlbnQuYWJyaW91QHN0LmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBs aW51eC5pZT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKQ2M6IGxpbnV4LWlh NjRAdmdlci5rZXJuZWwub3JnCkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnClNpZ25lZC1vZmYt Ynk6IE9saXZlciBPJ0hhbGxvcmFuIDxvb2hhbGxAZ21haWwuY29tPgpSZXZpZXdlZC1ieTogQmVu amFtaW4gR2FpZ25hcmQgPGJlbmphbWluLmdhaWduYXJkQGxpbmFyby5vcmc+ClNpZ25lZC1vZmYt Ynk6IFBoaWxpcHBlIENvcm51IDxwaGlsaXBwZS5jb3JudUBzdC5jb20+Ckxpbms6IGh0dHBzOi8v cGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE4MDQwMzA1MzQwMS4zMDA0 NS0xLW9vaGFsbEBnbWFpbC5jb20KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxn cmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogZHJpdmVycy9ncHUvZHJtL3N0aS9LY29u ZmlnIHwgICAgMyArLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMiBkZWxldGlv bnMoLSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdGkvS2NvbmZpZworKysgYi9kcml2ZXJzL2dw dS9kcm0vc3RpL0tjb25maWcKQEAgLTEsNiArMSw2IEBACiBjb25maWcgRFJNX1NUSQogCXRyaXN0 YXRlICJEUk0gU3VwcG9ydCBmb3IgU1RNaWNyb2VsZWN0cm9uaWNzIFNvQyBzdGlINHh4IFNlcmll cyIKLQlkZXBlbmRzIG9uIERSTSAmJiAoQVJDSF9TVEkgfHwgQVJDSF9NVUxUSVBMQVRGT1JNKQor CWRlcGVuZHMgb24gT0YgJiYgRFJNICYmIChBUkNIX1NUSSB8fCBBUkNIX01VTFRJUExBVEZPUk0p CiAJc2VsZWN0IFJFU0VUX0NPTlRST0xMRVIKIAlzZWxlY3QgRFJNX0tNU19IRUxQRVIKIAlzZWxl Y3QgRFJNX0dFTV9DTUFfSEVMUEVSCkBAIC04LDYgKzgsNSBAQCBjb25maWcgRFJNX1NUSQogCXNl bGVjdCBEUk1fUEFORUwKIAlzZWxlY3QgRldfTE9BREVSCiAJc2VsZWN0IFNORF9TT0NfSERNSV9D T0RFQyBpZiBTTkRfU09DCi0Jc2VsZWN0IE9GCiAJaGVscAogCSAgQ2hvb3NlIHRoaXMgb3B0aW9u IHRvIGVuYWJsZSBEUk0gb24gU1RNIHN0aUg0eHggY2hpcHNldAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= 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=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0F3C0C6778C for ; Fri, 6 Jul 2018 05:48:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3CDA23FE7 for ; Fri, 6 Jul 2018 05:48:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3CDA23FE7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933039AbeGFFr7 (ORCPT ); Fri, 6 Jul 2018 01:47:59 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59426 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932603AbeGFFr6 (ORCPT ); Fri, 6 Jul 2018 01:47:58 -0400 Received: from localhost (D57D388D.static.ziggozakelijk.nl [213.125.56.141]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 430CB86A; Fri, 6 Jul 2018 05:47:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Gaignard , Vincent Abriou , David Airlie , dri-devel@lists.freedesktop.org, linux-ia64@vger.kernel.org, Oliver OHalloran , Philippe Cornu Subject: [PATCH 4.17 22/46] drm/sti: Depend on OF rather than selecting it Date: Fri, 6 Jul 2018 07:46:43 +0200 Message-Id: <20180706054525.666782487@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180706054524.595521988@linuxfoundation.org> References: <20180706054524.595521988@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver O'Halloran commit c9fea6f4379c72b7c59e1efceab09a35bc7eac43 upstream. Commit cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") reworked some code inside of this driver and made it select CONFIG_OF. This results in the entire OF layer being enabled when building an allmodconfig on ia64. OF on ia64 is completely unsupported so this isn't a great state of affairs. The 0day robot noticed a link-time failure on ia64 caused by using of_node_to_nid() in an otherwise unrelated driver. The generic fallback for of_node_to_nid() only exists when: defined(CONFIG_OF) && defined(CONFIG_NUMA) == false Since CONFIG_NUMA is usually selected for IA64 we get the link failure. Fix this by making the driver depend on OF rather than selecting it, odds are that was the original intent. Link: https://lists.01.org/pipermail/kbuild-all/2018-March/045172.html Fixes: cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") Cc: Benjamin Gaignard Cc: Vincent Abriou Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: linux-ia64@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Oliver O'Halloran Reviewed-by: Benjamin Gaignard Signed-off-by: Philippe Cornu Link: https://patchwork.freedesktop.org/patch/msgid/20180403053401.30045-1-oohall@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/sti/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -1,6 +1,6 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" - depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM) select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER @@ -8,6 +8,5 @@ config DRM_STI select DRM_PANEL select FW_LOADER select SND_SOC_HDMI_CODEC if SND_SOC - select OF help Choose this option to enable DRM on STM stiH4xx chipset