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: 117817 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2236204qgn; Thu, 2 Nov 2017 07:25:21 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R2bI5Pju1LVSNjjiHqAQ4BEjhizKHGxx1K/zbnE9Odmqh7UjUyIWQezRpNsJjqLeg5iDkT X-Received: by 10.99.172.83 with SMTP id z19mr3874182pgn.46.1509632720953; Thu, 02 Nov 2017 07:25:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509632720; cv=none; d=google.com; s=arc-20160816; b=MzoON5n5BWU7G8JPTC4nV5CTfduO+jLivMHYrmeoiYVNX94/sQtY3Gd/iobdkJPFGi OB9u+Z+CAEM9w29kPdVQ8T54NUPwG9Y4k/1/QEp7ZN6zigXoP2iInhXip4NdWhfVUuU+ i88Tzx6r3yYXBWTPolCMjgIQz5p5t0ryGADk+kYDOGaVTIHE2FHKLxhbZ6KOkQ7GKXJ8 9c1cA8T8Izgk44nz/eZMkEQr3z4UDBTVdvNF+oTpYzMnL1vMX/ZUxUHo1gdH3FqL7k/j FdUljQre5bfzSdNZego9f7jJWEfsw8vICvkHKEslzkuHh3hb79aeEw+7E2tjFO1IVGn+ y06Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nwEuttvIuBP+0dvYw9jRB420M/PuY3IE7JaGSh/zO/s=; b=VgBL3QnPBb+X0K9LKAIuRW0UPxFYcKVd/GNHqwv0QfeEvGm2DpbbPli5/Ko9GwT2EO wpq4YLiMah9w3/L7irg8G1J6l5hU9EbMp8LAR0Ek7kJ99bOxv4TuPMjb3o+OW+xTBcG4 oBE7A5h93AomcE/DGKl2IMNPOovu4R7CBD3NPfndBm2LnM5e1LaNQr80pjU9Q8FTi5s3 D1dESPD8B8btzZEK5T7bX4DEg0f2j0UVzXo/KF4mosTUipTPmXRk1ywbRaPzCscRyz1z Fq8PowwcfGPjUdX3kn+la2x6zZ2XQsU7QpoFXaI88QzNmKD2Cj7rZWqR5FlMFUuj+YpE DtsQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p10si2322082pls.390.2017.11.02.07.25.19; Thu, 02 Nov 2017 07:25:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933349AbdKBOZR (ORCPT + 26 others); 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 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_K=C3=B6n?= =?utf-8?q?ig?= 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 Precedence: bulk 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. -- 2.9.0 Reviewed-by: Harry Wentland 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(); \