From nobody Wed Dec 17 00:17:02 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 3E82CC10F04 for ; Fri, 8 Dec 2023 05:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1573202AbjLHFzx (ORCPT ); Fri, 8 Dec 2023 00:55:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573238AbjLHFzS (ORCPT ); Fri, 8 Dec 2023 00:55:18 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9356171F for ; Thu, 7 Dec 2023 21:55:15 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1d0538d9bbcso15753855ad.3 for ; Thu, 07 Dec 2023 21:55:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1702014915; x=1702619715; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/zgqNM1BLjQpwqOX8AAkpOEPaYmCztUSTZLlWDykd+Y=; b=HyNaN4jO36Y3dQjRUjxnl/YivfNCiWNb3xYU4wqX8ZOI5UIjeFbzV1l3h2cdnMrbhd fI3c6ZB8d1JYo1a1c4YnVbwTqEXvVA0oEUthuLtZJjChmrpK9wzwrl4vu6/gGzlANjmf ygC+sJq+ps53oKiHSwdYcPc2wm4rxfI6sBv/4x8poR/GbMtmgo5oVsOo46f1/z0+RjdC XDYQXFwlvAsAcyqpRnGLt7F4fnbr66Wed+9USZr7uZUDBArRgrpehD52kh+teXkZHenl dVxUwZufUYMiZkmWGBYTgI/MQq3ccVTZrj+0JgUSFQFz7OAsL+45U9d4jhAtD2vdJNpK /toQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702014915; x=1702619715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/zgqNM1BLjQpwqOX8AAkpOEPaYmCztUSTZLlWDykd+Y=; b=o9VjQMlvozCY1pS/9xqDap2EDEdCartvJ5u7vtumxOwKOLL0qU0px/8Bo9lh2bRZpR Am3lEyesBqjY2HgDx4+Ij4ncWooW9wWeCk1/nWqI0e3IrCygd1Y9/Je7Qjf4qyHZYyv0 xCa/AiM12JWBMRjEScswtgmPLBOOi+wbnUcSYNkxk+6gt/H9G+sivCe4MWdUuAhHf6ZS aOlYImKKHXVbBwyObHt1bpueLZud7doVWRxvu4Nc1MfuGdbz96MVn8XhW9fYcP36TL8i NfRVOBUciHuNpsNjy1EwdtqUiN7fMfpJmBtJzFOxhqJ6yP/boowCzkfTv1HozozC8im+ tI4A== X-Gm-Message-State: AOJu0YwlJZTX1jRN0WM0qm3tpN00cbAh/72mZhkKqysySs9GzzQu5jLC bHA3xDg3daFYuzBiy48CFUO+jg== X-Google-Smtp-Source: AGHT+IEeohhdRoDbIB76rfeg/hp1f0wvfoQ9mNCmH7fkkS6XWgt0u4/Ycqf6R8fGDv+mLvCYfXsFug== X-Received: by 2002:a17:902:e88a:b0:1d0:68a:4a46 with SMTP id w10-20020a170902e88a00b001d0068a4a46mr4585686plg.3.1702014915181; Thu, 07 Dec 2023 21:55:15 -0800 (PST) Received: from sw06.internal.sifive.com ([4.53.31.132]) by smtp.gmail.com with ESMTPSA id s22-20020a170902989600b001ce5b859a59sm786250plp.305.2023.12.07.21.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 21:55:14 -0800 (PST) From: Samuel Holland To: linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-riscv@lists.infradead.org, Christoph Hellwig Cc: linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, linux-arch@vger.kernel.org, Samuel Holland Subject: [RFC PATCH 10/12] drm/amd/display: Use ARCH_HAS_KERNEL_FPU_SUPPORT Date: Thu, 7 Dec 2023 21:54:40 -0800 Message-ID: <20231208055501.2916202-11-samuel.holland@sifive.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231208055501.2916202-1-samuel.holland@sifive.com> References: <20231208055501.2916202-1-samuel.holland@sifive.com> 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" Now that all previously-supported architectures select ARCH_HAS_KERNEL_FPU_SUPPORT, this code can depend on that symbol instead of the existing list of architectures. It can also take advantage of the common kernel-mode FPU API and method of adjusting CFLAGS. Signed-off-by: Samuel Holland --- drivers/gpu/drm/amd/display/Kconfig | 2 +- .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 33 +---------------- drivers/gpu/drm/amd/display/dc/dml/Makefile | 36 ++----------------- drivers/gpu/drm/amd/display/dc/dml2/Makefile | 36 ++----------------- 4 files changed, 6 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/disp= lay/Kconfig index 901d1961b739..5fcd4f778dc3 100644 --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@ -8,7 +8,7 @@ config DRM_AMD_DC depends on BROKEN || !CC_IS_CLANG || ARM64 || RISCV || SPARC64 || X86_64 select SND_HDA_COMPONENT if SND_HDA_CORE # !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752 - select DRM_AMD_DC_FP if (X86 || LOONGARCH || (PPC64 && ALTIVEC) || (ARM64= && KERNEL_MODE_NEON && !CC_IS_CLANG)) + select DRM_AMD_DC_FP if ARCH_HAS_KERNEL_FPU_SUPPORT && (!ARM64 || !CC_IS_= CLANG) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c b/drivers/gpu/d= rm/amd/display/amdgpu_dm/dc_fpu.c index 4ae4720535a5..b64f917174ca 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c @@ -26,16 +26,7 @@ =20 #include "dc_trace.h" =20 -#if defined(CONFIG_X86) -#include -#elif defined(CONFIG_PPC64) -#include -#include -#elif defined(CONFIG_ARM64) -#include -#elif defined(CONFIG_LOONGARCH) #include -#endif =20 /** * DOC: DC FPU manipulation overview @@ -87,20 +78,9 @@ void dc_fpu_begin(const char *function_name, const int l= ine) WARN_ON_ONCE(!in_task()); preempt_disable(); depth =3D __this_cpu_inc_return(fpu_recursion_depth); - if (depth =3D=3D 1) { -#if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) + BUG_ON(!kernel_fpu_available()); kernel_fpu_begin(); -#elif defined(CONFIG_PPC64) - if (cpu_has_feature(CPU_FTR_VSX_COMP)) - enable_kernel_vsx(); - else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) - enable_kernel_altivec(); - else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) - enable_kernel_fp(); -#elif defined(CONFIG_ARM64) - kernel_neon_begin(); -#endif } =20 TRACE_DCN_FPU(true, function_name, line, depth); @@ -122,18 +102,7 @@ void dc_fpu_end(const char *function_name, const int l= ine) =20 depth =3D __this_cpu_dec_return(fpu_recursion_depth); if (depth =3D=3D 0) { -#if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) kernel_fpu_end(); -#elif defined(CONFIG_PPC64) - if (cpu_has_feature(CPU_FTR_VSX_COMP)) - disable_kernel_vsx(); - else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) - disable_kernel_altivec(); - else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) - disable_kernel_fp(); -#elif defined(CONFIG_ARM64) - kernel_neon_end(); -#endif } else { WARN_ON_ONCE(depth < 0); } diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/= amd/display/dc/dml/Makefile index ea7d60f9a9b4..5aad0f572ba3 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -25,40 +25,8 @@ # It provides the general basic services required by other DAL # subcomponents. =20 -ifdef CONFIG_X86 -dml_ccflags-$(CONFIG_CC_IS_GCC) :=3D -mhard-float -dml_ccflags :=3D $(dml_ccflags-y) -msse -endif - -ifdef CONFIG_PPC64 -dml_ccflags :=3D -mhard-float -maltivec -endif - -ifdef CONFIG_ARM64 -dml_rcflags :=3D -mgeneral-regs-only -endif - -ifdef CONFIG_LOONGARCH -dml_ccflags :=3D -mfpu=3D64 -dml_rcflags :=3D -msoft-float -endif - -ifdef CONFIG_CC_IS_GCC -ifneq ($(call gcc-min-version, 70100),y) -IS_OLD_GCC =3D 1 -endif -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-bound= ary=3D3 -# (8B stack alignment). -dml_ccflags +=3D -mpreferred-stack-boundary=3D4 -else -dml_ccflags +=3D -msse2 -endif -endif +dml_ccflags :=3D $(CC_FLAGS_FPU) +dml_rcflags :=3D $(CC_FLAGS_NO_FPU) =20 ifneq ($(CONFIG_FRAME_WARN),0) frame_warn_flag :=3D -Wframe-larger-than=3D2048 diff --git a/drivers/gpu/drm/amd/display/dc/dml2/Makefile b/drivers/gpu/drm= /amd/display/dc/dml2/Makefile index acff3449b8d7..4f6c804a26ad 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml2/Makefile @@ -24,40 +24,8 @@ # # Makefile for dml2. =20 -ifdef CONFIG_X86 -dml2_ccflags-$(CONFIG_CC_IS_GCC) :=3D -mhard-float -dml2_ccflags :=3D $(dml2_ccflags-y) -msse -endif - -ifdef CONFIG_PPC64 -dml2_ccflags :=3D -mhard-float -maltivec -endif - -ifdef CONFIG_ARM64 -dml2_rcflags :=3D -mgeneral-regs-only -endif - -ifdef CONFIG_LOONGARCH -dml2_ccflags :=3D -mfpu=3D64 -dml2_rcflags :=3D -msoft-float -endif - -ifdef CONFIG_CC_IS_GCC -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC =3D 1 -endif -endif - -ifdef CONFIG_X86 -ifdef IS_OLD_GCC -# Stack alignment mismatch, proceed with caution. -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-bound= ary=3D3 -# (8B stack alignment). -dml2_ccflags +=3D -mpreferred-stack-boundary=3D4 -else -dml2_ccflags +=3D -msse2 -endif -endif +dml2_ccflags :=3D $(CC_FLAGS_FPU) +dml2_rcflags :=3D $(CC_FLAGS_NO_FPU) =20 ifneq ($(CONFIG_FRAME_WARN),0) ifeq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)),y) --=20 2.42.0