From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933335AbdKBOZR (ORCPT ); Thu, 2 Nov 2017 10:25:17 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:55496 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752688AbdKBOZP (ORCPT ); Thu, 2 Nov 2017 10:25:15 -0400 From: Arnd Bergmann To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Cc: Arnd Bergmann , David Airlie , Harry Wentland , Tony Cheng , Dave Airlie , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(); \ -- 2.9.0