From: "Christian König" <christian.koenig@amd.com>
To: Jeremy Cline <jcline@redhat.com>,
Harry Wentland <harry.wentland@amd.com>,
Leo Li <sunpeng.li@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Timothy Pearson <tpearson@raptorengineering.com>
Subject: Re: [PATCH] amdgpu: Avoid sleeping during FPU critical sections
Date: Mon, 11 Jan 2021 09:53:56 +0100 [thread overview]
Message-ID: <3c94f9d6-501d-271c-ca83-1cf4229cb3ab@amd.com> (raw)
In-Reply-To: <20210108215838.470637-1-jcline@redhat.com>
Am 08.01.21 um 22:58 schrieb Jeremy Cline:
> dcn20_resource_construct() includes a number of kzalloc(GFP_KERNEL)
> calls which can sleep, but kernel_fpu_begin() disables preemption and
> sleeping in this context is invalid.
>
> The only places the FPU appears to be required is in the
> init_soc_bounding_box() function and when calculating the
> {min,max}_fill_clk_mhz. Narrow the scope to just these two parts to
> avoid sleeping while using the FPU.
>
> Fixes: 7a8a3430be15 ("amdgpu: Wrap FPU dependent functions in dc20")
> Cc: Timothy Pearson <tpearson@raptorengineering.com>
> Signed-off-by: Jeremy Cline <jcline@redhat.com>
Good catch, but I would rather replace the kzalloc(GFP_KERNEL) with a
kzalloc(GFP_ATOMIC) for now.
We have tons of problems with this DC_FP_START()/DC_FP_END() annotations
and are even in the process of moving them out of the file because the
compiles tend to clutter FP registers even outside of the annotated
ranges on some architectures.
Regards,
Christian.
> ---
> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index e04ecf0fc0db..a4fa5bf016c1 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -3622,6 +3622,7 @@ static bool init_soc_bounding_box(struct dc *dc,
> if (bb && ASICREV_IS_NAVI12_P(dc->ctx->asic_id.hw_internal_rev)) {
> int i;
>
> + DC_FP_START();
> dcn2_0_nv12_soc.sr_exit_time_us =
> fixed16_to_double_to_cpu(bb->sr_exit_time_us);
> dcn2_0_nv12_soc.sr_enter_plus_exit_time_us =
> @@ -3721,6 +3722,7 @@ static bool init_soc_bounding_box(struct dc *dc,
> dcn2_0_nv12_soc.clock_limits[i].dram_speed_mts =
> fixed16_to_double_to_cpu(bb->clock_limits[i].dram_speed_mts);
> }
> + DC_FP_END();
> }
>
> if (pool->base.pp_smu) {
> @@ -3777,8 +3779,6 @@ static bool dcn20_resource_construct(
> enum dml_project dml_project_version =
> get_dml_project_version(ctx->asic_id.hw_internal_rev);
>
> - DC_FP_START();
> -
> ctx->dc_bios->regs = &bios_regs;
> pool->base.funcs = &dcn20_res_pool_funcs;
>
> @@ -3959,8 +3959,10 @@ static bool dcn20_resource_construct(
> ranges.reader_wm_sets[i].wm_inst = i;
> ranges.reader_wm_sets[i].min_drain_clk_mhz = PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MIN;
> ranges.reader_wm_sets[i].max_drain_clk_mhz = PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MAX;
> + DC_FP_START();
> ranges.reader_wm_sets[i].min_fill_clk_mhz = (i > 0) ? (loaded_bb->clock_limits[i - 1].dram_speed_mts / 16) + 1 : 0;
> ranges.reader_wm_sets[i].max_fill_clk_mhz = loaded_bb->clock_limits[i].dram_speed_mts / 16;
> + DC_FP_END();
>
> ranges.num_reader_wm_sets = i + 1;
> }
> @@ -4125,12 +4127,10 @@ static bool dcn20_resource_construct(
> pool->base.oem_device = NULL;
> }
>
> - DC_FP_END();
> return true;
>
> create_fail:
>
> - DC_FP_END();
> dcn20_resource_destruct(pool);
>
> return false;
next prev parent reply other threads:[~2021-01-11 8:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 21:58 Jeremy Cline
2021-01-11 8:53 ` Christian König [this message]
2021-01-11 15:39 ` Jeremy Cline
2021-01-12 11:01 ` Christian König
2021-01-11 16:32 ` Daniel Vetter
2021-01-12 10:58 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3c94f9d6-501d-271c-ca83-1cf4229cb3ab@amd.com \
--to=christian.koenig@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=jcline@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sunpeng.li@amd.com \
--cc=tpearson@raptorengineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®