From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753465AbdLGOOb (ORCPT ); Thu, 7 Dec 2017 09:14:31 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:56390 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058AbdLGOO3 (ORCPT ); Thu, 7 Dec 2017 09:14:29 -0500 From: Arnd Bergmann To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie Cc: Arnd Bergmann , Chris Wilson , Tvrtko Ursulin , Mika Kuoppala , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915: add FTRACE dependency for DRM_I915_TRACE_GEM Date: Thu, 7 Dec 2017 15:14:00 +0100 Message-Id: <20171207141413.2008240-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:t24B+QiT6GOsOiHtavM5D7g0UhPZxpzFJCzxko+qYIJ02B0ngM1 KfR8CVAwIc0zhDbwR2VVUfL4Aw3l/OM/GuYss/cTWPv0LWFAxDC0oZuswre+fU8rinWeTiM 2J3fnJdfgeHFdyCGmnnzErBGgC1fRJZRo+BKjBwuYGa+MXt36iNfCg3lRN8vAim97YBpRQo 7qLdkd2qa+8oRlgGk3fRw== X-UI-Out-Filterresults: notjunk:1;V01:K0:dy5C7oJSo9g=:u5nj6ZUWM+SgaHZnbBlzC2 h7JP/UnPQzzbmD6bKPh7zbYuDOPfIt5MyZZ/xl7zbA3PYxA7NHSHvaTRdtOue0zr93Ggu+hKj XfxWhChQqPn8mr8rrYTXDE9/w5Z1wgORMi+aJCrsMphxeP8W/aNxK/NS27UwXZuZcNnyRVih7 MGRRNSkeJ5vw9yxYRj29/V9xEcWcTDO6FP3LrEz8MS3nHGNRWgmkABLd2oQSh/N+GAojU19DB TI6OFLMvJGPasZ/EAe1b6ZeEVZYPxKwXHbDF28HFoTt1k2lcmxug247xRFQmAuzhgFGwfDeZ9 V7kRNA7nq2drDoUqTfRoNcKfFSe6DDKZguY43FmGfj9/wnnCWNxcqpdkehgEs4dLc5huWk98W bb/aB1nCGbp9loNWOndb5KppOMuVIO3NqT7jBhs/OTZ5Bsj9JDHxCH9jY3MVpODLm9+RVcBG3 EG8mgbez8yIq4GOaDneX/cyA5U1MjSs2OWlh8e6B123aVyB8ihNONiPIOahUTKQVhd8Q8mWhl YhYcGWvyEaJmqoT6Cqu/hSgJuPbGo48u6DSBIZWStUiyHi21iQ4peg5pa8uuAzqh+hBt6IoXy OlfcVQ2TsBfK3803Gjsnbs/s9pCUGx8TdXMxOEjoS9pZb4wxd5lhOyR+HH9EZGUw0wqPfF7eK SXqi7wxPd576NMl8lwcpbBGeU9/TaSLquv2bH+20oGn4BsUJK7N9gUXeCuQqifPU6XFur7Yse 3bpni4TKiKwCDmVxbqKAfRoHfiXaKxFro4RTfg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new trace option gratuitously added a 'select TRACING' statement, which now causes build failures in other code that assumed tracepoints were only available with FTRACE: ERROR: "__tracepoint_ucsi_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_register_port" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_notify" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_reset_ppm" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_run_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! drivers/usb/dwc3/gadget.o: In function `__dwc3_prepare_one_trb': gadget.c:(.text+0x1c5): undefined reference to `__tracepoint_dwc3_prepare_trb' drivers/usb/dwc3/gadget.o: In function `__dwc3_cleanup_done_trbs': gadget.c:(.text+0x3f0): undefined reference to `__tracepoint_dwc3_complete_trb' drivers/usb/dwc3/gadget.o: In function `dwc3_gadget_ep_free_request': gadget.c:(.text+0x666): undefined reference to `__tracepoint_dwc3_free_request' This adds an explicit FTRACE dependency here, to ensure this is already the case. This matches what the other drivers have that select TRACING. Generally speaking, there is a bigger problem with CONFIG_DRM_I915_DEBUG though, it selects several other partially related symbols (DEBUGFS, I2C_CHARDEV, PREEMPT_COUNT, X86_MSR, etc that are each user-visible and that other symbols in turn depend on. This can easily lead to circular dependencies and should be avoided. I tried turning those all into 'depends on', which is normally a good strategy, but that seems to completely defeat the intention of CONFIG_DRM_I915_DEBUG. It might be better to just remove this completely, possibly replace it with a Kconfig fragment. Fixes: bccd3b831185 ("drm/i915: Use trace_printk to provide a death rattle for GEM") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/Kconfig.debug | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug index fa36491495b1..1a1b9732f657 100644 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@ -18,6 +18,7 @@ config DRM_I915_WERROR config DRM_I915_DEBUG bool "Enable additional driver debugging" depends on DRM_I915 + depends on FTRACE # for DRM_I915_TRACE_GEM select DEBUG_FS select PREEMPT_COUNT select I2C_CHARDEV @@ -53,6 +54,7 @@ config DRM_I915_DEBUG_GEM config DRM_I915_TRACE_GEM bool "Insert extra ftrace output from the GEM internals" + depends on FTRACE select TRACING default n help -- 2.9.0