Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <1586f68e-c635-482f-9399-2b027b766543@amd.com>
Date:   Mon, 28 Mar 2022 08:55:11 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH 1/2] drm/amd/display: detach fpu operations from
 dcn10_validate_bandwidth in calcs
Content-Language: en-US
To:     Melissa Wen <mwen@igalia.com>, amd-gfx@lists.freedesktop.org,
        harry.wentland@amd.com, sunpeng.li@amd.com,
        Rodrigo.Siqueira@amd.com, alexander.deucher@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>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20220326202448.2046077-1-mwen@igalia.com>
 <20220326202448.2046077-2-mwen@igalia.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20220326202448.2046077-2-mwen@igalia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZHJuNDNia21BNlM1QU1GMHZmeWVZRW1JcXg0R3FmSlhtZzFtVS9hOFk5alht?=
 =?utf-8?B?Qi93UVRJK3hRaGV5VEVsd1RxWnUyTUgweGRXRXVwUDFtbHp0WVBPajlGZVFz?=
 =?utf-8?B?SzN3ZEEvVG5SUVJjNzM5L1VpYVJBd00weHVYMTZ1dTYvRWk4aVNRdmU4WG5N?=
 =?utf-8?B?bmFYUEw1YUhrM2p5aFNObG9DOFhFVFBxZ0ZhdXRBcWxlYnNhMzlwU013NWI5?=
 =?utf-8?B?a1hKbXpldXFJcFBuMWx1Vm0zWlV1VXJNT2Z0cllUb09WMW5EUUxQNVprcE9m?=
 =?utf-8?B?d2Z4Q0VDRE5QYVRjZVo1Q3ZwWDdCeHdhYTJHcUtVU1NTQlVCdStrRWRLbG9D?=
 =?utf-8?B?dHYrcUVTeFMzWnVNTHl0WlMxTm5GckN2MlR0bEU4ZDhYeTVkVmRiNlFtME8v?=
 =?utf-8?B?bmsrVnRwUVRVNHNiYVlNdU14K3dwZE8rakZwajNvZXpvR0FTRWZxeEEzdURy?=
 =?utf-8?B?SXVENDgyK2hpWVY0M3F6Uld3NStKb0R4dDBGcEZIUnBzdDJDdmROLzRUOUV4?=
 =?utf-8?B?T3hudEMzdE9ydE04Q2FJWlVoNkZlOGlsbUFuMjRtRXZac2xvVzFlOGJhSDRB?=
 =?utf-8?B?dHduc2Q4UlNDbE4xQTdjelBGbEhqc1o2c1VObXE2Tld6bmJqVnNiL2VIWGtZ?=
 =?utf-8?B?WUtiWGlyQmlYS2czWFMvbHVERE9pamNxcTJHaFU0SEhYYUs4NDNURkxkVHVR?=
 =?utf-8?B?cTNNbU9vWDU4cFAwdGdhWG5TRUthREFuRHVnQmE3dEZQN3NINHNsL2orWWIr?=
 =?utf-8?B?c3B4Ky8xbHBBYUppRVJsYnhJYk9mM2FWMCtPQi9idkdrdnBWVk1EeGhWS2Iy?=
 =?utf-8?B?cDhaaTRaMWIxaG8rZWFLek9KZUFhTHV5R0F5c2dmRmI2RDQvSElQQ3M4NVM0?=
 =?utf-8?B?ZHJIelpKcEdITFpaTjUwT0o2NkVPSld2UFVoYklwNk1uUjlxVTZucWZrSCt0?=
 =?utf-8?B?aitkVHlqWittQ1VVcVlzMzVNUGJ5NnluWEJVTG9RZmNNQm54QUFta3VKaHds?=
 =?utf-8?B?Y3BQOWZvOFNicENibzM2bG81d2I1V3llTjMwRmxtbVNlNTFld013K1FxQ2dE?=
 =?utf-8?B?bGVzeXpUM3FFaFpuRU9iS1R4b29KdjFYZkI5VVM4WkVIdnZ3OXBaVTVXcXZI?=
 =?utf-8?B?b2lsUWk4VXlWc2FjK0RINWFBUVhKQlBiU3IrS1BZWXFub3hPVTZqRXpMaktp?=
 =?utf-8?B?dTlvcUhyV1Zrc3R3akVETitMWDZDbWpTcVhCQkxwM0w0a2FSa3BXWWtwb0lp?=
 =?utf-8?B?bDhFZkIxYmNKZWdIcmQwRU5Pd3FFckQxM0RuVDBzenpxT2xJQzNPVHcxRVQ3?=
 =?utf-8?B?enp0WGpNSFlja0dPR0FkVmVZK0N1c0doVmFjdEV0VWlJTzl0eW1BRXk2YmZt?=
 =?utf-8?B?NmQ3YnY0aWJDdWpTV1l0bFpLQ2JGcFFsK0FWZVRPa2FManhwcVBLM09UQzNN?=
 =?utf-8?B?c0JWWkgrS3pyY3RadkkyWEM0REgweXNkUlN1QjNRT0orVm9jd2pVWlJzNWdW?=
 =?utf-8?B?WHhucGdhQ1dWL0d4RU03MGdwWGhJQmtvb2xLM1h2QXNzKzZ5LzJBRGNHTi9p?=
 =?utf-8?B?N3NYbXdXSmcxWjBrMUlaQnpUQ285M2h6NVNPWGFJMVRUUXFnaFE0YmVRSFN3?=
 =?utf-8?B?Z0FiYkl4MGdrc1FpdlhNbHFrNzlyaktza214WEYvMHl5L0t6RkorNnhFTjhH?=
 =?utf-8?B?UXR0TDkvVVJsekQ5M0FMYkJXSC9zVXpmRDNVQU5IWnZnZ1k0ZnlZWjZDbHdy?=
 =?utf-8?B?cmNHZVVsWnpaMTc5bXlPcGM0QUN0MHlFY0hBeWt2Q1JDQ1EvNFV1S0ZaT0RB?=
 =?utf-8?B?OW0vOEtKSXdnQ0VMZFN5b0xpRkx0UDM3Q1daYW1GaFZLdDR6VjVHWG5ENE9J?=
 =?utf-8?B?QndnT3dNS2U1dWJNRUVDUUtuQVdFVVN4aWpsMVFkbHlmTUF0VWcvbU5ZTW05?=
 =?utf-8?B?S1doL1hxbHczWjVJaDBxRDVwd2RSSXppT1Q5RktqRllGeVFnN3lNcm9BNU1M?=
 =?utf-8?B?TFQyVStENFVhVXhiamx0bmNBbFdadmZsUU9vQlVRTFVZdnQvK0JUNXovVkZt?=
 =?utf-8?B?ZXRDK3pXRFI2OGp3Zjh6U05FK3dEZmVNcFU1Q3lXeXZiWWN2N2doWGlrc2p6?=
 =?utf-8?B?MXNBdE4vSW92UVYwTGY2VEtoMERUS1RoNG9GazgxWUoxNTJTUjBnSlZUWU1O?=
 =?utf-8?B?Y0dSOUdsYlJXMmdmOHY4Q2twZk5EME9EYXl1ZUwyTS9qQlN3YnBNM1haMzV5?=
 =?utf-8?B?Q0lQa1VaN1VmK2p1VzhNRDhiSGtlUURiWExXb25sOEgzSmdSd1VXdGVVdlp5?=
 =?utf-8?B?dVVIZ1JMT3VwN0w2ZGUycmlZR0lhaXBXcVNVbkE1WFc1MnZadU53dFl2YVJK?=
 =?utf-8?Q?yyxCGdTohDnOK9x1GwkKj9hxsPCznL/pvOL7V0WpPz7UN?=
X-MS-Exchange-AntiSpam-MessageData-1: Prl+VtOFgYHMig==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3dab5765-c61f-4063-9546-08da1087eaed
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2022 06:55:17.7070
 (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: kwJbSNHVqMqypYJV1a4yvPhR13lNFyUZY3Jt2xWzQO7qWU5BdkgojObRVPnbzTwM
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1142
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=no 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

Am 26.03.22 um 21:24 schrieb Melissa Wen:
> dcn10_validate_bandwidth is only used on dcn10 files, but is declared in
> dcn_calcs files. Rename dcn10_* to dcn_* in calcs, remove DC_FP_* wrapper
> inside DML folder and create an specific dcn10_validate_bandwidth in
> dcn10_resources that calls dcn_validate_bandwidth and properly wraps that
> FPU function with DC_FP_* macro.
>
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  | 14 ++++++++++++++
>   .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c   |  5 +----
>   drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h     |  2 +-
>   3 files changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> index 4048908dd265..1587a060b55a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> @@ -1141,6 +1141,20 @@ static void dcn10_destroy_resource_pool(struct resource_pool **pool)
>   	*pool = NULL;
>   }
>   
> +static bool dcn10_validate_bandwidth(
> +		struct dc *dc,
> +		struct dc_state *context,
> +		bool fast_validate)
> +{
> +	bool voltage_supported;
> +
> +	DC_FP_START();
> +	voltage_supported = dcn_validate_bandwidth(dc, context, fast_validate);
> +	DC_FP_END();
> +
> +	return voltage_supported;
> +}
> +
>   static enum dc_status dcn10_validate_plane(const struct dc_plane_state *plane_state, struct dc_caps *caps)
>   {
>   	if (plane_state->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c
> index e447c74be713..c25023f7d604 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c
> @@ -764,7 +764,7 @@ static unsigned int get_highest_allowed_voltage_level(uint32_t chip_family,
>   	return 4;
>   }
>   
> -bool dcn10_validate_bandwidth(
> +bool dcn_validate_bandwidth(
>   		struct dc *dc,
>   		struct dc_state *context,
>   		bool fast_validate)
> @@ -790,7 +790,6 @@ bool dcn10_validate_bandwidth(
>   		dcn_bw_sync_calcs_and_dml(dc);
>   
>   	memset(v, 0, sizeof(*v));
> -	DC_FP_START();
>   
>   	v->sr_exit_time = dc->dcn_soc->sr_exit_time;
>   	v->sr_enter_plus_exit_time = dc->dcn_soc->sr_enter_plus_exit_time;
> @@ -1323,8 +1322,6 @@ bool dcn10_validate_bandwidth(
>   	bw_limit = dc->dcn_soc->percent_disp_bw_limit * v->fabric_and_dram_bandwidth_vmax0p9;
>   	bw_limit_pass = (v->total_data_read_bandwidth / 1000.0) < bw_limit;
>   
> -	DC_FP_END();
> -
>   	PERFORMANCE_TRACE_END();
>   	BW_VAL_TRACE_FINISH();
>   
> diff --git a/drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h b/drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h
> index 337c0161e72d..806f3041db14 100644
> --- a/drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h
> +++ b/drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h
> @@ -619,7 +619,7 @@ struct dcn_ip_params {
>   };
>   extern const struct dcn_ip_params dcn10_ip_defaults;
>   
> -bool dcn10_validate_bandwidth(
> +bool dcn_validate_bandwidth(
>   		struct dc *dc,
>   		struct dc_state *context,
>   		bool fast_validate);

Just for the record: That's not really usual kernel coding style, but 
that's not topic of this patch set.

The series is Acked-by: Christian König <christian.koenig@amd.com>

And it would be really nice if we could make the DC_FP_* macros somehow 
fail in the dml folder.

Thanks,
Christian.