* Re: [PATCH 02/40] drm/amd/display: Add SubVP required code [not found] ` <20220630191322.909650-3-Rodrigo.Siqueira@amd.com> @ 2022-07-06 17:58 ` Nathan Chancellor 2022-07-06 19:38 ` Alex Deucher 0 siblings, 1 reply; 3+ messages in thread From: Nathan Chancellor @ 2022-07-06 17:58 UTC (permalink / raw) To: Rodrigo Siqueira Cc: amd-gfx, stylon.wang, Alan Liu, Sunpeng.Li, Harry.Wentland, qingqing.zhuo, roman.li, Alvin Lee, solomon.chiu, jerry.zuo, Aurabindo.Pillai, hamza.mahfooz, wayne.lin, Jun Lei, Bhawanpreet.Lakha, agustin.gutierrez, pavle.kotarac, llvm On Thu, Jun 30, 2022 at 03:12:44PM -0400, Rodrigo Siqueira wrote: > From: Alvin Lee <Alvin.Lee2@amd.com> > > This commit enables the SubVP feature. To achieve that, we need to: > > - Don't force p-state disallow on SubVP (can't block dummy p-state) > - Send calculated watermark to DMCUB for SubVP > - Adjust CAB mode message to PMFW > - Add a proper locking sequence for SubVP > - Various fixes to SubVP static analysis and determining SubVP config > - Currently SubVP not supported with pipe split so merge all pipes > before setting up SubVp > > Reviewed-by: Jun Lei <Jun.Lei@amd.com> > Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > Acked-by: Alan Liu <HaoPing.Liu@amd.com> > Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com> This patch is now in linux-next as commit 85f4bc0c333c ("drm/amd/display: Add SubVP required code"), where it causes build failures when building for arm64 with both Clang and GCC (see bisect log below). Clang shows errors during modpost: ERROR: modpost: "__floatunsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__divdf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "fma" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__adddf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__fixdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__muldf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__floatsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__fixunsdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! GCC shows errors along the lines of: In function 'populate_subvp_cmd_pipe_info', inlined from 'dc_dmub_setup_subvp_dmub_command' at /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:675:5: /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:603:91: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:604:63: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:602:72: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types 602 | pipe_data->pipe_config.subvp_data.prefetch_to_mall_start_lines = | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 605 | (double)phantom_timing->h_total; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ I initially reproduced this with Fedora's configuration [1] but it appears that allmodconfig should show it as well. Our CI also shows problems for ARCH=riscv allmodconfig [2]. I am happy to test patches as necessary. [1]: https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-aarch64-fedora.config [2]: https://builds.tuxbuild.com/2BZS5HPSuDdoMFw6mxjG2ZmT441/build.log Cheers, Nathan # bad: [088b9c375534d905a4d337c78db3b3bfbb52c4a0] Add linux-next specific files for 20220706 # good: [e35e5b6f695d241ffb1d223207da58a1fbcdff4b] Merge tag 'xsa-5.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip git bisect start '088b9c375534d905a4d337c78db3b3bfbb52c4a0' 'e35e5b6f695d241ffb1d223207da58a1fbcdff4b' # good: [1a4255ede07a967e57115b54da5bd4b571d22a8c] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc git bisect good 1a4255ede07a967e57115b54da5bd4b571d22a8c # bad: [756b44529e2ab179e4dd6f6358b5c351e1bbe5d3] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git git bisect bad 756b44529e2ab179e4dd6f6358b5c351e1bbe5d3 # bad: [f26873a2fc786251765db3e0ced8e1424b862059] next-20220705/sound-asoc git bisect bad f26873a2fc786251765db3e0ced8e1424b862059 # good: [fc34ece41f7183d522d15dc4189d8df6e8e23737] ASoC: Refactor non_legacy_dai_naming flag git bisect good fc34ece41f7183d522d15dc4189d8df6e8e23737 # good: [3d313f09f31490cec9d5251b59adeb6542c944cc] drm/fourcc: fix integer type usage in uapi header git bisect good 3d313f09f31490cec9d5251b59adeb6542c944cc # bad: [a41afb357f09cde0714db9d590458c7bb6d90ca2] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel git bisect bad a41afb357f09cde0714db9d590458c7bb6d90ca2 # bad: [88ef4c5bb36bf60b317b74d8652c7766c9272a7e] drm/amd/display: Apply ODM 2:1 policy for single display configuration git bisect bad 88ef4c5bb36bf60b317b74d8652c7766c9272a7e # good: [ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc] drm/amd/display: expose additional modifier for DCN32/321 git bisect good ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc # good: [414e9f520e897818302a6b1729aa2dad8cc928ca] drm/amdkfd: Asynchronously free smi_client git bisect good 414e9f520e897818302a6b1729aa2dad8cc928ca # good: [4bdb9d6501763e83bacbf26846754c567773a1fb] drm/amdkfd: simplify vm_validate_pt_pd_bos git bisect good 4bdb9d6501763e83bacbf26846754c567773a1fb # good: [e72f03f4bdc4f3a251343cf343bce28c28cbac2a] drm/amd/display: Add missing registers for ACP git bisect good e72f03f4bdc4f3a251343cf343bce28c28cbac2a # bad: [90f33674a0756a6f0907b8f6350cec3f7be4032c] drm/amd/display: Prepare for new interfaces git bisect bad 90f33674a0756a6f0907b8f6350cec3f7be4032c # bad: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code git bisect bad 85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1 # first bad commit: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 02/40] drm/amd/display: Add SubVP required code 2022-07-06 17:58 ` [PATCH 02/40] drm/amd/display: Add SubVP required code Nathan Chancellor @ 2022-07-06 19:38 ` Alex Deucher 2022-07-06 20:30 ` Nathan Chancellor 0 siblings, 1 reply; 3+ messages in thread From: Alex Deucher @ 2022-07-06 19:38 UTC (permalink / raw) To: Nathan Chancellor Cc: Rodrigo Siqueira, Stylon Wang, Alan Liu, Leo (Sunpeng) Li, Bhawanpreet Lakha, Qingqing Zhuo, llvm, Roman Li, amd-gfx list, Solomon Chiu, Jerry Zuo, Aurabindo Pillai, Alvin Lee, Kotarac, Pavle, Wayne Lin, Jun Lei, Wentland, Harry, Gutierrez, Agustin, Mahfooz, Hamza [-- Attachment #1: Type: text/plain, Size: 7085 bytes --] On Wed, Jul 6, 2022 at 1:58 PM Nathan Chancellor <nathan@kernel.org> wrote: > > On Thu, Jun 30, 2022 at 03:12:44PM -0400, Rodrigo Siqueira wrote: > > From: Alvin Lee <Alvin.Lee2@amd.com> > > > > This commit enables the SubVP feature. To achieve that, we need to: > > > > - Don't force p-state disallow on SubVP (can't block dummy p-state) > > - Send calculated watermark to DMCUB for SubVP > > - Adjust CAB mode message to PMFW > > - Add a proper locking sequence for SubVP > > - Various fixes to SubVP static analysis and determining SubVP config > > - Currently SubVP not supported with pipe split so merge all pipes > > before setting up SubVp > > > > Reviewed-by: Jun Lei <Jun.Lei@amd.com> > > Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > Acked-by: Alan Liu <HaoPing.Liu@amd.com> > > Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com> > > This patch is now in linux-next as commit 85f4bc0c333c > ("drm/amd/display: Add SubVP required code"), where it causes build > failures when building for arm64 with both Clang and GCC (see bisect log > below). > > Clang shows errors during modpost: > > ERROR: modpost: "__floatunsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__divdf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "fma" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__adddf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__fixdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__muldf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__floatsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__fixunsdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > I think the attached patch may fix this. Alex > GCC shows errors along the lines of: > > In function 'populate_subvp_cmd_pipe_info', > inlined from 'dc_dmub_setup_subvp_dmub_command' at /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:675:5: > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:603:91: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:604:63: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:602:72: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > 602 | pipe_data->pipe_config.subvp_data.prefetch_to_mall_start_lines = > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 605 | (double)phantom_timing->h_total; > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > I initially reproduced this with Fedora's configuration [1] but it > appears that allmodconfig should show it as well. Our CI also shows > problems for ARCH=riscv allmodconfig [2]. > > I am happy to test patches as necessary. > > [1]: https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-aarch64-fedora.config > [2]: https://builds.tuxbuild.com/2BZS5HPSuDdoMFw6mxjG2ZmT441/build.log > > Cheers, > Nathan > > # bad: [088b9c375534d905a4d337c78db3b3bfbb52c4a0] Add linux-next specific files for 20220706 > # good: [e35e5b6f695d241ffb1d223207da58a1fbcdff4b] Merge tag 'xsa-5.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip > git bisect start '088b9c375534d905a4d337c78db3b3bfbb52c4a0' 'e35e5b6f695d241ffb1d223207da58a1fbcdff4b' > # good: [1a4255ede07a967e57115b54da5bd4b571d22a8c] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc > git bisect good 1a4255ede07a967e57115b54da5bd4b571d22a8c > # bad: [756b44529e2ab179e4dd6f6358b5c351e1bbe5d3] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git > git bisect bad 756b44529e2ab179e4dd6f6358b5c351e1bbe5d3 > # bad: [f26873a2fc786251765db3e0ced8e1424b862059] next-20220705/sound-asoc > git bisect bad f26873a2fc786251765db3e0ced8e1424b862059 > # good: [fc34ece41f7183d522d15dc4189d8df6e8e23737] ASoC: Refactor non_legacy_dai_naming flag > git bisect good fc34ece41f7183d522d15dc4189d8df6e8e23737 > # good: [3d313f09f31490cec9d5251b59adeb6542c944cc] drm/fourcc: fix integer type usage in uapi header > git bisect good 3d313f09f31490cec9d5251b59adeb6542c944cc > # bad: [a41afb357f09cde0714db9d590458c7bb6d90ca2] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel > git bisect bad a41afb357f09cde0714db9d590458c7bb6d90ca2 > # bad: [88ef4c5bb36bf60b317b74d8652c7766c9272a7e] drm/amd/display: Apply ODM 2:1 policy for single display configuration > git bisect bad 88ef4c5bb36bf60b317b74d8652c7766c9272a7e > # good: [ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc] drm/amd/display: expose additional modifier for DCN32/321 > git bisect good ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc > # good: [414e9f520e897818302a6b1729aa2dad8cc928ca] drm/amdkfd: Asynchronously free smi_client > git bisect good 414e9f520e897818302a6b1729aa2dad8cc928ca > # good: [4bdb9d6501763e83bacbf26846754c567773a1fb] drm/amdkfd: simplify vm_validate_pt_pd_bos > git bisect good 4bdb9d6501763e83bacbf26846754c567773a1fb > # good: [e72f03f4bdc4f3a251343cf343bce28c28cbac2a] drm/amd/display: Add missing registers for ACP > git bisect good e72f03f4bdc4f3a251343cf343bce28c28cbac2a > # bad: [90f33674a0756a6f0907b8f6350cec3f7be4032c] drm/amd/display: Prepare for new interfaces > git bisect bad 90f33674a0756a6f0907b8f6350cec3f7be4032c > # bad: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code > git bisect bad 85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1 > # first bad commit: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code [-- Attachment #2: 0001-drm-amd-display-fix-non-x86-PPC64-compilation.patch --] [-- Type: text/x-patch, Size: 2567 bytes --] From 78730be1522677752ab26f57d6f8c68b96d3966e Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Wed, 6 Jul 2022 15:33:01 -0400 Subject: [PATCH] drm/amd/display: fix non-x86/PPC64 compilation Need to protect FP DMCUB code with CONFIG_DRM_AMD_DC_DCN. Fixes build failures like the following on arm64: ERROR: modpost: "__floatunsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__divdf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "fma" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__adddf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__fixdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__muldf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__floatsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__fixunsdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! Fixes: 85f4bc0c333c ("drm/amd/display: Add SubVP required code") Reported-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 ++ drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c index 6a25d64dd15c..6b446ae9e91f 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c @@ -370,6 +370,7 @@ void dc_dmub_srv_query_caps_cmd(struct dmub_srv *dmub) } } +#ifdef CONFIG_DRM_AMD_DC_DCN /** * *********************************************************************************************** * populate_subvp_cmd_drr_info: Helper to populate DRR pipe info for the DMCUB subvp command @@ -698,6 +699,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc, dc_dmub_srv_cmd_execute(dc->ctx->dmub_srv); dc_dmub_srv_wait_idle(dc->ctx->dmub_srv); } +#endif bool dc_dmub_srv_get_diagnostic_data(struct dc_dmub_srv *dc_dmub_srv, struct dmub_diagnostic_data *diag_data) { diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile index fe29725b4c06..932d85fa4262 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile @@ -27,7 +27,6 @@ ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1 endif -dcn32_ccflags += -mhard-float endif ifdef CONFIG_X86 -- 2.35.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 02/40] drm/amd/display: Add SubVP required code 2022-07-06 19:38 ` Alex Deucher @ 2022-07-06 20:30 ` Nathan Chancellor 0 siblings, 0 replies; 3+ messages in thread From: Nathan Chancellor @ 2022-07-06 20:30 UTC (permalink / raw) To: Alex Deucher Cc: Rodrigo Siqueira, Stylon Wang, Alan Liu, Leo (Sunpeng) Li, Bhawanpreet Lakha, Qingqing Zhuo, llvm, Roman Li, amd-gfx list, Solomon Chiu, Jerry Zuo, Aurabindo Pillai, Alvin Lee, Kotarac, Pavle, Wayne Lin, Jun Lei, Wentland, Harry, Gutierrez, Agustin, Mahfooz, Hamza On Wed, Jul 06, 2022 at 03:38:57PM -0400, Alex Deucher wrote: > On Wed, Jul 6, 2022 at 1:58 PM Nathan Chancellor <nathan@kernel.org> wrote: > > > > On Thu, Jun 30, 2022 at 03:12:44PM -0400, Rodrigo Siqueira wrote: > > > From: Alvin Lee <Alvin.Lee2@amd.com> > > > > > > This commit enables the SubVP feature. To achieve that, we need to: > > > > > > - Don't force p-state disallow on SubVP (can't block dummy p-state) > > > - Send calculated watermark to DMCUB for SubVP > > > - Adjust CAB mode message to PMFW > > > - Add a proper locking sequence for SubVP > > > - Various fixes to SubVP static analysis and determining SubVP config > > > - Currently SubVP not supported with pipe split so merge all pipes > > > before setting up SubVp > > > > > > Reviewed-by: Jun Lei <Jun.Lei@amd.com> > > > Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > > Acked-by: Alan Liu <HaoPing.Liu@amd.com> > > > Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com> > > > > This patch is now in linux-next as commit 85f4bc0c333c > > ("drm/amd/display: Add SubVP required code"), where it causes build > > failures when building for arm64 with both Clang and GCC (see bisect log > > below). > > > > Clang shows errors during modpost: > > > > ERROR: modpost: "__floatunsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__divdf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "fma" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__adddf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__fixdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__muldf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__floatsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > ERROR: modpost: "__fixunsdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > > > I think the attached patch may fix this. Indeed, I tested both arm64 and riscv: Tested-by: Nathan Chancellor <nathan@kernel.org> > > GCC shows errors along the lines of: > > > > In function 'populate_subvp_cmd_pipe_info', > > inlined from 'dc_dmub_setup_subvp_dmub_command' at /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:675:5: > > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:603:91: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ > > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:604:63: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ > > /home/nathan/cbl/src/linux-next/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:602:72: error: '-mgeneral-regs-only' is incompatible with the use of floating-point types > > 602 | pipe_data->pipe_config.subvp_data.prefetch_to_mall_start_lines = > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ > > 603 | (((double)dc->caps.subvp_prefetch_end_to_mall_start_us / 1000000) * > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > 604 | (phantom_timing->pix_clk_100hz * 100) + phantom_timing->h_total - 1) / > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > 605 | (double)phantom_timing->h_total; > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > I initially reproduced this with Fedora's configuration [1] but it > > appears that allmodconfig should show it as well. Our CI also shows > > problems for ARCH=riscv allmodconfig [2]. > > > > I am happy to test patches as necessary. > > > > [1]: https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-aarch64-fedora.config > > [2]: https://builds.tuxbuild.com/2BZS5HPSuDdoMFw6mxjG2ZmT441/build.log > > > > Cheers, > > Nathan > > > > # bad: [088b9c375534d905a4d337c78db3b3bfbb52c4a0] Add linux-next specific files for 20220706 > > # good: [e35e5b6f695d241ffb1d223207da58a1fbcdff4b] Merge tag 'xsa-5.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip > > git bisect start '088b9c375534d905a4d337c78db3b3bfbb52c4a0' 'e35e5b6f695d241ffb1d223207da58a1fbcdff4b' > > # good: [1a4255ede07a967e57115b54da5bd4b571d22a8c] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc > > git bisect good 1a4255ede07a967e57115b54da5bd4b571d22a8c > > # bad: [756b44529e2ab179e4dd6f6358b5c351e1bbe5d3] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git > > git bisect bad 756b44529e2ab179e4dd6f6358b5c351e1bbe5d3 > > # bad: [f26873a2fc786251765db3e0ced8e1424b862059] next-20220705/sound-asoc > > git bisect bad f26873a2fc786251765db3e0ced8e1424b862059 > > # good: [fc34ece41f7183d522d15dc4189d8df6e8e23737] ASoC: Refactor non_legacy_dai_naming flag > > git bisect good fc34ece41f7183d522d15dc4189d8df6e8e23737 > > # good: [3d313f09f31490cec9d5251b59adeb6542c944cc] drm/fourcc: fix integer type usage in uapi header > > git bisect good 3d313f09f31490cec9d5251b59adeb6542c944cc > > # bad: [a41afb357f09cde0714db9d590458c7bb6d90ca2] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel > > git bisect bad a41afb357f09cde0714db9d590458c7bb6d90ca2 > > # bad: [88ef4c5bb36bf60b317b74d8652c7766c9272a7e] drm/amd/display: Apply ODM 2:1 policy for single display configuration > > git bisect bad 88ef4c5bb36bf60b317b74d8652c7766c9272a7e > > # good: [ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc] drm/amd/display: expose additional modifier for DCN32/321 > > git bisect good ff15cea338d2c78e0086d55c8a9dd637a5dd3ccc > > # good: [414e9f520e897818302a6b1729aa2dad8cc928ca] drm/amdkfd: Asynchronously free smi_client > > git bisect good 414e9f520e897818302a6b1729aa2dad8cc928ca > > # good: [4bdb9d6501763e83bacbf26846754c567773a1fb] drm/amdkfd: simplify vm_validate_pt_pd_bos > > git bisect good 4bdb9d6501763e83bacbf26846754c567773a1fb > > # good: [e72f03f4bdc4f3a251343cf343bce28c28cbac2a] drm/amd/display: Add missing registers for ACP > > git bisect good e72f03f4bdc4f3a251343cf343bce28c28cbac2a > > # bad: [90f33674a0756a6f0907b8f6350cec3f7be4032c] drm/amd/display: Prepare for new interfaces > > git bisect bad 90f33674a0756a6f0907b8f6350cec3f7be4032c > > # bad: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code > > git bisect bad 85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1 > > # first bad commit: [85f4bc0c333ceed24cbc9f69a2a77fab1ae3d4d1] drm/amd/display: Add SubVP required code > From 78730be1522677752ab26f57d6f8c68b96d3966e Mon Sep 17 00:00:00 2001 > From: Alex Deucher <alexander.deucher@amd.com> > Date: Wed, 6 Jul 2022 15:33:01 -0400 > Subject: [PATCH] drm/amd/display: fix non-x86/PPC64 compilation > > Need to protect FP DMCUB code with CONFIG_DRM_AMD_DC_DCN. > Fixes build failures like the following on arm64: > ERROR: modpost: "__floatunsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__divdf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "fma" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__adddf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__fixdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__muldf3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__floatsidf" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > ERROR: modpost: "__fixunsdfsi" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! > > Fixes: 85f4bc0c333c ("drm/amd/display: Add SubVP required code") > Reported-by: Nathan Chancellor <nathan@kernel.org> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 ++ > drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c > index 6a25d64dd15c..6b446ae9e91f 100644 > --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c > +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c > @@ -370,6 +370,7 @@ void dc_dmub_srv_query_caps_cmd(struct dmub_srv *dmub) > } > } > > +#ifdef CONFIG_DRM_AMD_DC_DCN > /** > * *********************************************************************************************** > * populate_subvp_cmd_drr_info: Helper to populate DRR pipe info for the DMCUB subvp command > @@ -698,6 +699,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc, > dc_dmub_srv_cmd_execute(dc->ctx->dmub_srv); > dc_dmub_srv_wait_idle(dc->ctx->dmub_srv); > } > +#endif > > bool dc_dmub_srv_get_diagnostic_data(struct dc_dmub_srv *dc_dmub_srv, struct dmub_diagnostic_data *diag_data) > { > diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile > index fe29725b4c06..932d85fa4262 100644 > --- a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile > @@ -27,7 +27,6 @@ ifdef CONFIG_CC_IS_GCC > ifeq ($(call cc-ifversion, -lt, 0701, y), y) > IS_OLD_GCC = 1 > endif > -dcn32_ccflags += -mhard-float > endif > > ifdef CONFIG_X86 > -- > 2.35.3 > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-06 20:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220630191322.909650-1-Rodrigo.Siqueira@amd.com>
[not found] ` <20220630191322.909650-3-Rodrigo.Siqueira@amd.com>
2022-07-06 17:58 ` [PATCH 02/40] drm/amd/display: Add SubVP required code Nathan Chancellor
2022-07-06 19:38 ` Alex Deucher
2022-07-06 20:30 ` Nathan Chancellor
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox