From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753804AbdKBL1O (ORCPT ); Thu, 2 Nov 2017 07:27:14 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:62133 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbdKBL1N (ORCPT ); Thu, 2 Nov 2017 07:27:13 -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 , "Edward O'Callaghan" , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] drm/amdgpu/display: provide ASSERT macros unconditionally Date: Thu, 2 Nov 2017 12:26:41 +0100 Message-Id: <20171102112657.111405-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:nPVo576yWmfLJzdFbR4Wbr2roa7QJz21Zm7Zf+WvBbVgIzkxEmp p91FRUxYiletfCT2YpTcd/y6SZ+FdVwhaPsXD06jvCMtV5bBsZ09vWGC/+aBc1iQAgBRcQT Y6iVt+Pa8jeaQcpG8uvdlvvQLJtriJfC3UNeh5F9W3+u0jULCesyocpRmafnTD5LOPM4MYk gnI4c3lKFDgWa4srhmwng== X-UI-Out-Filterresults: notjunk:1;V01:K0:7di+JGZOLbs=:NxQQ8Qhr0ozwzp+uONkmbQ woWXic5IwOh5sGTjnprf/e2ADnRtDqxKzaEyRJWK897W59UuSOo4GCd679s/CBFYZACbuo48s GwpNGyVsZVRRMI/c2xEZmoodLtdVUxyVHgxFqy8jeWDlivJ4wTLrC7abDl5H+VGIsyEyRGWvW cL8DVFLRdVmPGlTwSI7buEqJKCXJTQ5x+vaElWtjSDJcPf/UFFdFIEZCP0ertkuxeNgXoEAGP ItrgLZlHf1rC9L4AEKHlAOz5tgCgyeI3jPfpCzissZEV0ua3OsOrc4MMy6kI4aFiRcHDtqjR5 dSZAZyXQr8Vl+VSDEFio5Z4JJHKPNzVKOCqnTXBUEI459oqvJh1bIckp0x5y673qVTpFNsLff xQVzypg85SzKbDqFiFywhEF6egDZ1KlR+ddaPoPLczFIakIuTOhdDyiV5g7vc+qXCJb2f6/cS qaLfX67aEJ7A5sR/XAYvBC+j8YYg5CxQUjGXPscusjXujuvuja6DuHFH7E56hlaydr3xk+bjB 7FacgrJuSkeVIPnGxzBa5Izj/j6RMahD23as4jxKGP0GQeS+5ZwgXz9wp0ksnRrhQKv0wfbsS lYhrdWTmwQcoqSb1U8uCVMETZj1/QHybtNQtHpfVhQ5OAK1oJ3uIuZEFh34JJsgF49WtAIjch JnGxayioB3yN0iu3D4qn9xWMNQUV/z6rs4/k7ceSU2bPYGTCujJPZksj9qZ10uiSmSM97E11F /RWnzYh2D9fVpZQE7EkOsSWTPjhsOz40PCWzyg== 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 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h index 86170b40b5c5..499bd52004cf 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))) { \ @@ -75,7 +73,7 @@ ; \ } \ } while (0) -#endif +#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ #if defined(CONFIG_DEBUG_KERNEL_DC) #define ASSERT(expr) ASSERT_CRITICAL(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