From nobody Fri Dec 19 19:15:43 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9ADB14A0B6; Wed, 13 Mar 2024 16:43:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348209; cv=none; b=SOSmZCZQ3BKshTIaWwwOwZ6d2h2MiMkdzcAwG5Us+QkrIndMxXqRUJwMzJKfqD60Bw6PaP68dKZv8ar+8o/KJ72cNYxJQT9ZMwdVBIrrhoQxeYcrt5HG52faELYa6WgBEgSclLMf4u4mD0RWafGgRkOxjqoQeXrbCL41exNU9bc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348209; c=relaxed/simple; bh=Fd4BmX0q2dviXv8ZBe0IndRZBVtCPxqAMvzM1rbIf+E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=di8ff25M9bLZC6conCUzk9e4PnqPf2VI7AZp4lbG/SsuvX0iFJqeWDty4bW4G6S4raKLpXpsgeYImOPJj7Hx9h3vfNGoIXo5tzWQJpQ6H5zHt4BLfPWSj0K2lfY3Hkf1DE1G67/wYao2Ag6mwFFVm6zyGiBfhsq3L0F7nxmNpJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AKZv2gZH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AKZv2gZH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEC52C43390; Wed, 13 Mar 2024 16:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348208; bh=Fd4BmX0q2dviXv8ZBe0IndRZBVtCPxqAMvzM1rbIf+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKZv2gZHAfQDcBItrinvlIU3M3f0oNH2Onwdpn4W4KzhUb2iINBuCZigIiQ/JerId QJq4VUeY721XkonVqFVd8el9Dm0bOUw2seN5p4F/zM4R85zf+h1wFxVGkwcBNXKJe4 NsB3fo1dnUhKInyBEZB+UvI32VVbEIWQLLSKBAzE6ozOS6+MsF8K1MR+h10plFL4Ww 69FwM4UYdQO5whUSiwHuSVKuAnlLZqCmZ7zfw97Z0gt96Zo3mGRsVogG+pOBgQPBdV 1F19rAa+ZocGoh81DKsEc6esgGK5U7qghsdwL6A6fGg+EVnp8CGA9ZF0EJL2uc3ddh JoSzQZ+oQArEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qingqing Zhuo , Rodrigo Siqueira , Solomon Chiu , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 56/76] drm/amd/display: Re-arrange FPU code structure for dcn2x Date: Wed, 13 Mar 2024 12:42:03 -0400 Message-ID: <20240313164223.615640-57-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313164223.615640-1-sashal@kernel.org> References: <20240313164223.615640-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.152-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.15.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.15.152-rc1 X-KernelTest-Deadline: 2024-03-15T16:42+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Qingqing Zhuo [ Upstream commit ee37341199c61558b73113659695c90bf4736eb2 ] [Why] Current FPU code for DCN2x is located under dml/dcn2x. This is not aligned with DC's general source tree structure. [How] Move FPU code for DCN2x to dml/dcn20. Reviewed-by: Rodrigo Siqueira Acked-by: Solomon Chiu Signed-off-by: Qingqing Zhuo Signed-off-by: Alex Deucher Stable-dep-of: e63e35f0164c ("drm/amd/display: Increase frame-larger-than f= or all display_mode_vba files") Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 ++-- .../amd/display/dc/dml/{dcn2x/dcn2x.c =3D> dcn20/dcn20_fpu.c} | 2 +- .../amd/display/dc/dml/{dcn2x/dcn2x.h =3D> dcn20/dcn20_fpu.h} | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.c =3D> dcn20/dcn20_= fpu.c} (99%) rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.h =3D> dcn20/dcn20_= fpu.h} (94%) 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 b1bf80da3a55f..ab0c6d1910382 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c @@ -52,7 +52,7 @@ static DEFINE_PER_CPU(int, fpu_recursion_depth); * This function tells if the code is already under FPU protection or not.= A * function that works as an API for a set of FPU operations can use this * function for checking if the caller invoked it after DC_FP_START(). For - * example, take a look at dcn2x.c file. + * example, take a look at dcn20_fpu.c file. */ inline void dc_assert_fp_enabled(void) { diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/driver= s/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index ede11eb120d4f..04b370e7e732e 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -35,7 +35,7 @@ #include "include/irq_service_interface.h" #include "dcn20/dcn20_resource.h" =20 -#include "dml/dcn2x/dcn2x.h" +#include "dml/dcn20/dcn20_fpu.h" =20 #include "dcn10/dcn10_hubp.h" #include "dcn10/dcn10_ipp.h" diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/driver= s/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c index 5b8274b8c3845..7c5c1414b7a1c 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -35,7 +35,7 @@ #include "include/irq_service_interface.h" #include "dcn20/dcn20_resource.h" =20 -#include "dml/dcn2x/dcn2x.h" +#include "dml/dcn20/dcn20_fpu.h" =20 #include "clk_mgr.h" #include "dcn10/dcn10_hubp.h" diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/= amd/display/dc/dml/Makefile index 9009b92490f34..e7bb69ec99b66 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -58,7 +58,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o :=3D $(dml= _ccflags) =20 ifdef CONFIG_DRM_AMD_DC_DCN CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o :=3D $(dml_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o :=3D $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o :=3D $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o :=3D $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o :=3D $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o :=3D $(dml_ccfl= ags) @@ -95,8 +95,8 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers= .o :=3D $(dml_rcflags) DML =3D display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_ca= lc.o \ =20 ifdef CONFIG_DRM_AMD_DC_DCN +DML +=3D dcn20/dcn20_fpu.o DML +=3D display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_m= ode_vba_20.o -DML +=3D dcn2x/dcn2x.o DML +=3D dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML +=3D dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML +=3D dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c b/drivers/gpu= /drm/amd/display/dc/dml/dcn20/dcn20_fpu.c similarity index 99% rename from drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c rename to drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c index c58522436291a..d590dc9173637 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c @@ -26,7 +26,7 @@ =20 #include "resource.h" =20 -#include "dcn2x.h" +#include "dcn20_fpu.h" =20 /** * DOC: DCN2x FPU manipulation Overview diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.h b/drivers/gpu= /drm/amd/display/dc/dml/dcn20/dcn20_fpu.h similarity index 94% rename from drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.h rename to drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h index 331547ba07132..36f26126d574b 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h @@ -24,11 +24,11 @@ * */ =20 -#ifndef __DCN2X_H__ -#define __DCN2X_H__ +#ifndef __DCN20_FPU_H__ +#define __DCN20_FPU_H__ =20 void dcn20_populate_dml_writeback_from_context(struct dc *dc, struct resource_context *res_ctx, display_e2e_pipe_params_st *pipes); =20 -#endif /* __DCN2X_H__ */ +#endif /* __DCN20_FPU_H__ */ --=20 2.43.0