Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <fed8e5e1-18ea-cc68-328c-3d36c5ff98d2@amd.com>
Date:   Tue, 26 Apr 2022 12:23:10 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] drm/amd/display: protect remaining FPU-code calls on
 dcn3.1.x
Content-Language: en-US
To:     Melissa Wen <mwen@igalia.com>, harry.wentland@amd.com,
        sunpeng.li@amd.com, alexander.deucher@amd.com,
        christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie,
        daniel@ffwll.ch
Cc:     Qingqing Zhuo <qingqing.zhuo@amd.com>,
        Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>,
        Jasdeep Dhillon <jdhillon@amd.com>,
        chandan.vurdigerenataraj@amd.com, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20220330230204.2473636-1-mwen@igalia.com>
From:   Rodrigo Siqueira Jordao <Rodrigo.Siqueira@amd.com>
In-Reply-To: <20220330230204.2473636-1-mwen@igalia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MG5RTnhwM1Ivam5iSjJURUFENUNSc0E2dFg4S1lLNEhPSlJtWldPSFRGNmVL?=
 =?utf-8?B?VU1pMHMyWFZkNGxMVFhIVVNtbXM2cENNV3R6QUdaN21qK01ZR2phVWsyelVJ?=
 =?utf-8?B?QVRhSGtxSEJLaHpwcWtXSG1XOWNRS01WNG9nU3RDS0Rpa2FGUDVYSEhMYjE3?=
 =?utf-8?B?U2J3SWZGUE5WVHd0TGNKUS9SRmJLMHhYSDQ0MVRHZlNkaTl1MnJqTjR3WXJV?=
 =?utf-8?B?Vk1XZTdYdTgvYlhsOFhyZ1hwUjM0Z2V2RDZCQWxSOGlndzlodjgrWEVZU0Fp?=
 =?utf-8?B?NVhSOWtTVFg3Qk9ZcnVxcG1VZWpNdWZWQ2t4akJVZU1uMVNEOG1aMHJXK1lp?=
 =?utf-8?B?ZFdic1JsSXNCS3NHZ0pRYmlrL01uMUlneFUyWVRwSmZiUnBpdG55ZkpVOUMy?=
 =?utf-8?B?MkswUUVpL0V5NFhVcGh5TTd1Q3dmZGZ3T0dRaGN4SjZyTXBrL2kwRkNPcUVq?=
 =?utf-8?B?UVo0NVh3ZEIzOFFYVzZQUVQ3dGI0d0MwRlBtQ01mR1JDeFc0NVNJKzRwQkZm?=
 =?utf-8?B?LzlSTmF2M2ZyV2JTdndGc2JiUngyRHM1bE9BMTduRGh5b0RnK2tHZUdpbVpP?=
 =?utf-8?B?VWRUYzZ3Sk9VUFlCWEVZQnAzcjYvK2lhM25EREZxbzF4bExlUjBybmpkRm9q?=
 =?utf-8?B?Nm8xNEFWalVkelJ0UVdjSzBGdi9XVEFCZ1I3LzJ4eHE3czN6eFd0TGJ3K3M0?=
 =?utf-8?B?ODVoQXEzMm43ZjRmUWRoZXNqdHg1T1dwTnRSWFZ3NmY3Tm9ZSVhZcFFobUxO?=
 =?utf-8?B?U0hyOVh2UEJ6dlFCUUlDUnB1MnpBVnB3SG9ReisxRWFCVVR5NDFYQmxxVjVq?=
 =?utf-8?B?RTVyZERaNGlGMk4vWmI3aHhEektBYUlTeGk5enJTWnAvSzBKUmNqdGg1ZzV3?=
 =?utf-8?B?NzNuSHFsTjd2Yk1sWndkdkFtNW5ybHJyQm0zKytMMlI5bHlBNjVMNmROdXIv?=
 =?utf-8?B?UEdhQ3l1WkJjQzVCR0JIRm9nN20yTVZSL2NKZnRTM2FzbWFCdjNxZTdWMWpD?=
 =?utf-8?B?TFFxWStsNTB0S1pHOVVkb2pBTXkyWTcwS3BhaHNQa2NxM2ZWbU1sOEhuV2JV?=
 =?utf-8?B?MEpBM1pWWGk2UEVSbWJuVEZTWGNzZ1lqVmJMbDBQMWRRQVU0ZjRsdUh6MXZT?=
 =?utf-8?B?ZVNKQXNKck56YXFadzF1YnBmVDJaMGxLc1U5bFA0VmhVNmZTdUpzWjVnWld6?=
 =?utf-8?B?Qnh3NXlYSWZ2OHdnZ1FFeUhWKzAwQXNjZlY4bE54ZDNBRmlDcmxpYy9FZlYr?=
 =?utf-8?B?Y2xEQUMyZ3E1bVo5OXJPMmlIWnRmdHp2Q2ZaNTFDVStYSGkrOUVPQkI2TmZJ?=
 =?utf-8?B?Qlg5SUhSV3dRUVYxOUNzaXRXcUZOMHlmQ3lsWmdvdjBFU0l1NDdKaDhicG5o?=
 =?utf-8?B?VTNpWGc5bjBxbWxBK2xmNy96WXdPdVB6Y081bmRCZkJGbEpCZW9tVCsxdzB4?=
 =?utf-8?B?Z1huVG9KWExXdlkrdTRVbzVWT2VZdnloMnlrQWhMell6dUU5V2YzSUptbmRS?=
 =?utf-8?B?TCt5OUM4VGZzdXJhRGtzNTJ2OFZBam1EUTFQVFRYUHFwUGR4U09RKytRT05Q?=
 =?utf-8?B?aEJXWG5qc3gxbE9QM3VOd3lMOUU0a1NLQVRQVktSUHFhOUd4a3hiSGI5T3NU?=
 =?utf-8?B?dkZqa29rVEJGNnEzd3NDSklpOVpKRlRiZU9CaHY2eG5qZThrZ01yUHdkR2du?=
 =?utf-8?B?NjlFK1RCNFVkdFJWQkNpd1FXNkoxTFpCZ1RtSHpRY3ErWFl0MUZXWUhGZnVj?=
 =?utf-8?B?cmVyTTFpN3lzRzZ6Tno4WGtyWmx6M1BlZllBcnJNeU9Qd0RBS1BWMjJEZC9S?=
 =?utf-8?B?MXIwN2NuenVoQ0h6b0RrMUpadEt1Q1NhWTFNRDZVSnBCNVNEUHRUZ0RTeVp1?=
 =?utf-8?B?ZWdDS3J2R09FeVptWkJPelBjUHg4UDJybU4xVFR4SEx4a3hXdTk5ckFueWpu?=
 =?utf-8?B?Kzc0a01qczNsdmMyVWZiUWNnSXlQcEU3dEpMWE1wUmVxSjMrS1FTd2NuY0Vi?=
 =?utf-8?B?RzVqS0Fja1lyVFVoV0pHMjlrZVRneWxyL21kc3Vib0NNQmhuUnhha1djYklK?=
 =?utf-8?B?TGp5RVdtdFBYb0pUZEpYK3NQTHdjRjJvRDZxYW40OXZLdEJFMWdlWmc1bjFh?=
 =?utf-8?B?NEN5SFpUVzRlUXVlS1M4RmUxN2s3OGNZaVZuOTA4cWlsb2tZZ0xueGZITElh?=
 =?utf-8?B?Q1BqVU1BS3Bob3BHMFkxcExLV081YkZ5OVV5RGpWbUFVV1RRVkUwU081eGQz?=
 =?utf-8?B?ZEVJaWM4Q08wNGQ0UEVjcFU2V3FoUWtzaDU5NGJveWhUTzdNQ3dXNlpFbnpS?=
 =?utf-8?B?enplLzJoOFJnNnRYSlJVS1RsbnQ0eWYyamZJU1QwL2lyc0ZwOHErUT09?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 50a55260-6e62-4be7-c9ab-08da27a10f07
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB2941.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2022 16:23:12.4701
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Mzv8UNhmqZtMvx9xGq2AgtbrVXLeV4xFdHjJHnMkOu0caFPYq0VdSqtwAOByo8Q5kv79jUxcem7Bacv7n1/bAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3501
X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2022-03-30 19:02, Melissa Wen wrote:
>  From [1], I realized two other calls to dcn30 code are associated with
> FPU operations and are not protected by DC_FP_* macros:
> * dcn30_populate_dml_writeback_from_context()
> * dcn30_set_mcif_arb_params()
> 
> So, since FPU-associated code is not fully isolated in dcn30, and
> dcn3.1.x reuses them, let's wrap their calls properly.
> 
> Note: this patch complements the fix from [1].
> 
> [1] https://lore.kernel.org/amd-gfx/20220329082957.1662655-1-chandan.vurdigerenataraj@amd.com/
> 
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   .../drm/amd/display/dc/dcn31/dcn31_resource.c | 25 +++++++++++++++++--
>   .../drm/amd/display/dc/dcn31/dcn31_resource.h |  9 +++++++
>   .../amd/display/dc/dcn315/dcn315_resource.c   |  4 +--
>   .../amd/display/dc/dcn316/dcn316_resource.c   |  4 +--
>   4 files changed, 36 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> index bf130b2435ab..afdfec74ed08 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> @@ -1735,6 +1735,27 @@ void dcn31_calculate_wm_and_dlg(
>   	DC_FP_END();
>   }
>   
> +void
> +dcn31_populate_dml_writeback_from_context(struct dc *dc,
> +					  struct resource_context *res_ctx,
> +					  display_e2e_pipe_params_st *pipes)
> +{
> +	DC_FP_START();
> +	dcn30_populate_dml_writeback_from_context(dc, res_ctx, pipes);
> +	DC_FP_END();
> +}
> +
> +void
> +dcn31_set_mcif_arb_params(struct dc *dc,
> +			  struct dc_state *context,
> +			  display_e2e_pipe_params_st *pipes,
> +			  int pipe_cnt)
> +{
> +	DC_FP_START();
> +	dcn30_set_mcif_arb_params(dc, context, pipes, pipe_cnt);
> +	DC_FP_END();
> +}
> +
>   bool dcn31_validate_bandwidth(struct dc *dc,
>   		struct dc_state *context,
>   		bool fast_validate)
> @@ -1806,8 +1827,8 @@ static struct resource_funcs dcn31_res_pool_funcs = {
>   	.add_stream_to_ctx = dcn30_add_stream_to_ctx,
>   	.add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource,
>   	.remove_stream_from_ctx = dcn20_remove_stream_from_ctx,
> -	.populate_dml_writeback_from_context = dcn30_populate_dml_writeback_from_context,
> -	.set_mcif_arb_params = dcn30_set_mcif_arb_params,
> +	.populate_dml_writeback_from_context = dcn31_populate_dml_writeback_from_context,
> +	.set_mcif_arb_params = dcn31_set_mcif_arb_params,
>   	.find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link,
>   	.acquire_post_bldn_3dlut = dcn30_acquire_post_bldn_3dlut,
>   	.release_post_bldn_3dlut = dcn30_release_post_bldn_3dlut,
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h
> index 1ce6509c1ed1..393458015d6a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h
> @@ -50,6 +50,15 @@ int dcn31_populate_dml_pipes_from_context(
>   	struct dc *dc, struct dc_state *context,
>   	display_e2e_pipe_params_st *pipes,
>   	bool fast_validate);
> +void
> +dcn31_populate_dml_writeback_from_context(struct dc *dc,
> +					  struct resource_context *res_ctx,
> +					  display_e2e_pipe_params_st *pipes);
> +void
> +dcn31_set_mcif_arb_params(struct dc *dc,
> +			  struct dc_state *context,
> +			  display_e2e_pipe_params_st *pipes,
> +			  int pipe_cnt);
>   void dcn31_update_soc_for_wm_a(struct dc *dc, struct dc_state *context);
>   
>   struct resource_pool *dcn31_create_resource_pool(
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> index fadb89326999..06dd064e5997 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> @@ -1726,8 +1726,8 @@ static struct resource_funcs dcn315_res_pool_funcs = {
>   	.add_stream_to_ctx = dcn30_add_stream_to_ctx,
>   	.add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource,
>   	.remove_stream_from_ctx = dcn20_remove_stream_from_ctx,
> -	.populate_dml_writeback_from_context = dcn30_populate_dml_writeback_from_context,
> -	.set_mcif_arb_params = dcn30_set_mcif_arb_params,
> +	.populate_dml_writeback_from_context = dcn31_populate_dml_writeback_from_context,
> +	.set_mcif_arb_params = dcn31_set_mcif_arb_params,
>   	.find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link,
>   	.acquire_post_bldn_3dlut = dcn30_acquire_post_bldn_3dlut,
>   	.release_post_bldn_3dlut = dcn30_release_post_bldn_3dlut,
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> index d73145dab173..5db96ab38dd2 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> @@ -1728,8 +1728,8 @@ static struct resource_funcs dcn316_res_pool_funcs = {
>   	.add_stream_to_ctx = dcn30_add_stream_to_ctx,
>   	.add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource,
>   	.remove_stream_from_ctx = dcn20_remove_stream_from_ctx,
> -	.populate_dml_writeback_from_context = dcn30_populate_dml_writeback_from_context,
> -	.set_mcif_arb_params = dcn30_set_mcif_arb_params,
> +	.populate_dml_writeback_from_context = dcn31_populate_dml_writeback_from_context,
> +	.set_mcif_arb_params = dcn31_set_mcif_arb_params,
>   	.find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link,
>   	.acquire_post_bldn_3dlut = dcn30_acquire_post_bldn_3dlut,
>   	.release_post_bldn_3dlut = dcn30_release_post_bldn_3dlut,

Hi,

Sorry for the delay,

Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>

Also, applied to amd-staging-drm-next.

Thanks