From nobody Thu Dec 18 19:28:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA78C00528 for ; Fri, 4 Aug 2023 13:30:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbjHDNaA (ORCPT ); Fri, 4 Aug 2023 09:30:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229918AbjHDN3t (ORCPT ); Fri, 4 Aug 2023 09:29:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA4694C18 for ; Fri, 4 Aug 2023 06:29:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 283D861FFF for ; Fri, 4 Aug 2023 13:29:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 887B3C433C7; Fri, 4 Aug 2023 13:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691155771; bh=5QulDdnYOUr8lHiRjrxVRvtjbrNSF9IOJD1YPU7sdXo=; h=From:To:Cc:Subject:Date:From; b=ceUb0YBBcd+l01n1IJtnxQ34cRdsYUADJ5q7fxZOrRUJ4Th4VrUU3w8on9TFQkL8y PPBpoEaOnYEAEtl1obRmNPBeioIXlzIbYWJbdkGoJC2FkZHqQXCbXteFaTWjRRw/sl 6vmu/bSDTRnl1X3/SvbgaclRUZWwpCOd2hRVy3I6+R9Be0zFu7FVNqu/0/qj+hS6EI Mf1YiM4ZKuHL3g2gTS50LTR08FhPybwManzteY06HWpTrFImGanyPXdBYKqUwPQ262 obNADNL5//WSGE95cghlg+Xo04BoWDD8eURrjj9qMyMsudJVnjUaQXFihHZv0zhG/2 uIs/TVkpDDsOw== From: Arnd Bergmann To: Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , Philip Yang , Alex Sierra Cc: Arnd Bergmann , David Airlie , Daniel Vetter , Mukul Joshi , Graham Sider , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amdkfd: fix build failure without CONFIG_DYNAMIC_DEBUG Date: Fri, 4 Aug 2023 15:29:17 +0200 Message-Id: <20230804132924.2314478-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann When CONFIG_DYNAMIC_DEBUG is disabled altogether, calling _dynamic_func_call_no_desc() does not work: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c: In function 'svm_range_set_= attr': drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c:52:9: error: implicit declar= ation of function '_dynamic_func_call_no_desc' [-Werror=3Dimplicit-function= -declaration] 52 | _dynamic_func_call_no_desc("svm_range_dump", svm_range_debu= g_dump, svms) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c:3564:9: note: in expansion o= f macro 'dynamic_svm_range_dump' 3564 | dynamic_svm_range_dump(svms); | ^~~~~~~~~~~~~~~~~~~~~~ Add a compile-time conditional in addition to the runtime check. Fixes: 8923137dbe4b2 ("drm/amdkfd: avoid svm dump when dynamic debug disabl= ed") Signed-off-by: Arnd Bergmann Reviewed-by: Felix Kuehling --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amd= kfd/kfd_svm.c index 308384dbc502d..44e710821b6d9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -23,6 +23,7 @@ =20 #include #include +#include #include #include =20 @@ -48,8 +49,13 @@ * page table is updated. */ #define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING (2UL * NSEC_PER_MSEC) +#if IS_ENABLED(CONFIG_DYNAMIC_DEBUG) #define dynamic_svm_range_dump(svms) \ _dynamic_func_call_no_desc("svm_range_dump", svm_range_debug_dump, svms) +#else +#define dynamic_svm_range_dump(svms) \ + do { if (0) svm_range_debug_dump(svms); } while (0) +#endif =20 /* Giant svm range split into smaller ranges based on this, it is decided = using * minimum of all dGPU/APU 1/32 VRAM size, between 2MB to 1GB and alignmen= t to --=20 2.39.2