From patchwork Thu Nov 2 14:24:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10038787 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B09CD602D8 for ; Thu, 2 Nov 2017 14:25:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A36B12906D for ; Thu, 2 Nov 2017 14:25:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9869E29080; Thu, 2 Nov 2017 14:25:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DCC52906D for ; Thu, 2 Nov 2017 14:25:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 925166E925; Thu, 2 Nov 2017 14:25:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id ACCDF6E925; Thu, 2 Nov 2017 14:25:13 +0000 (UTC) Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.129]) with ESMTPA (Nemesis) id 0M2TGj-1dKVHm1xn3-00sKG2; Thu, 02 Nov 2017 15:25:03 +0100 From: Arnd Bergmann To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH v2] drm/amdgpu/display: provide ASSERT macros unconditionally Date: Thu, 2 Nov 2017 15:24:40 +0100 Message-Id: <20171102142501.684516-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:MHcwPq3j/Y+aIRXbTsGHn5PxROaOMiIlWh6uxMdpcZ6iZTaaJB1 PkvK+rxjohPb2sQ+eaUk+Sjnxb4elOZ3UeGFdQlU1JDfzDpAHhZT1MtI95yOja2CFrYcxxB FC3+vUS33of/SjFzIrRWOzoFjQMxDjUHZzCx8+nWMsfZpptbUNGmVI5Gh074DeTkgKrkkZj 6X1V/jsPSQsdRKhfvFmXg== X-UI-Out-Filterresults: notjunk:1; V01:K0:tEQoefoWYDo=:Zmhis/d8c1ygnvu9/fOsKv BNygWd8shGSW44uLIDkHl9jiZFQ7Bm/9zdaapH36M5qdLPYgbqQlQITz6r5fsVp26NnPNPsvT dmxyXZoTjuLW/iMtC7VdASAAr/h58OFB5wE/qPokgi9bBEmdg1gRxEEWZ7h14kNsTvNPr3l65 VGRkNfJofobuIErdpT/Gt4seSh2faFwIfDcfoUIFAK4JRIt3Resf+DChzC24Gl3sVYdha5Tzf QEbZIdB0Vi1LYhHJcQnWzjp7DRoYEj7W7cAEzv/vg5o/BLY+WY5RPMb2QXw+r0XIOytBjqziE Y46OepnRZCR0iTu1EAyijsWwfJE7CtTD+vTOk1hMHOxTYdo9mWG8DXq7+sl3+H9mkbH6PIGel 5OzNMcIvKJzvUWo9fio9lyUi826dy38D7rTyymX4RdMrXTUAgRHZ3TbebVI8UC2tDOVFSFvN5 5e4Rg4cIHkxkcUkZGij52ds3jUkjpgtX8UEX0deA1PJB8r5ff3VuZC6sB5mK9fjT2BAqLpwRZ nb7pxEdGYFyqB0tQWR2GrXllnvI7Y3ppq4QEnG9SgRa4w77elAu2WQpidiRRPCjOaOJd8sZ2Z kcYoW7yHZVypwvUHUo6IvYWY0UCbhabtnulMcO/oOKkkv7KLr4Xal4W7kV0wsKuWjBEJIKnFM HCe+H9E0viCb7wTY1m7N4Ev3+E8keBg8oF3KNJO0OfZtqcnvHMSHrpOJZTLXTobqra5Y28ki5 RmafJeMVK1OjgGIUAVBFqOBrx59ehg8BtV8Anw== Cc: Arnd Bergmann , David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Dave Airlie , Tony Cheng X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP It seems impossible to build this driver without setting either CONFIG_DEBUG_KERNEL or CONFIG_DEBUG_DRIVER: drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex': drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration] This moves the ASSERT() macro and related helpers outside of the #ifdef to get it to build again. Signed-off-by: Arnd Bergmann Reviewed-by: Harry Wentland --- drivers/gpu/drm/amd/display/dc/os_types.h | 4 ---- 1 file changed, 4 deletions(-) v2: remove accidtental comment change. diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h index 86170b40b5c5..a87c0329541f 100644 --- a/drivers/gpu/drm/amd/display/dc/os_types.h +++ b/drivers/gpu/drm/amd/display/dc/os_types.h @@ -61,8 +61,6 @@ * general debug capabilities * */ -#if defined(CONFIG_DEBUG_KERNEL) || defined(CONFIG_DEBUG_DRIVER) - #if defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB) #define ASSERT_CRITICAL(expr) do { \ if (WARN_ON(!(expr))) { \ @@ -86,8 +84,6 @@ #define BREAK_TO_DEBUGGER() ASSERT(0) -#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ - #define DC_ERR(...) do { \ dm_error(__VA_ARGS__); \ BREAK_TO_DEBUGGER(); \