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: <301c29e0-e520-1235-3ec6-0592b09ddbd1@amd.com>
Date:   Thu, 21 Jul 2022 14:59:21 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 5/5] drm/amd/display: move FPU code from dcn301 clk mgr to
 DML folder
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:     Guenter Roeck <linux@roeck-us.net>,
        =?UTF-8?Q?Ma=c3=adra_Canal?= <mairacanal@riseup.net>,
        kernel-dev@igalia.com, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20220720193208.1131493-1-mwen@igalia.com>
 <20220720193208.1131493-6-mwen@igalia.com>
From:   Rodrigo Siqueira Jordao <Rodrigo.Siqueira@amd.com>
In-Reply-To: <20220720193208.1131493-6-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?TjRKUFFyajdxdDRsMDhQcEVETml4c2ZZRjhna2VUSG1BNUhpQnVYbXg3UHFr?=
 =?utf-8?B?NEFJSGo2NFdUU3lENTZQUXB0djk2ZjM2TkdNVnpUdmhqSmpKUWh4RjJ4RjAy?=
 =?utf-8?B?ZWNpZWJ1YXhPZzA1cER0QndIWEIwY0pPR0thc1BPbTEvOGZoY01yWTlnZ0p0?=
 =?utf-8?B?ek4wbjVaMVl2Q0dOdXEzazNoM21EV2liQ21sZERZMjZmRldNeVQyOXp0aUNo?=
 =?utf-8?B?RjZ3VDlrNzdJOGVUbW9BaE5JNW5NTW03VEI5VEhqbEI0eURmWkQyejBrL2hY?=
 =?utf-8?B?VHpKVkNrQUR6Zi8zUVRFcWo2VXMxYlJPUnNHQ1ZRVUdsa3k3RFdLeGpzUjF4?=
 =?utf-8?B?M3ZJdUJFSEhEUFNkOGNHL2VFSjJEMU9SdVZuUVRxNXgzQlpxa3Rva0pWYThD?=
 =?utf-8?B?VDZFWlR6SVZGVENvSUhzcTBVQUZ4WUUrREtJektvRHdZa3R2cFpPbmF3cXdk?=
 =?utf-8?B?cEErUmR4RkNDZ3dwRzRvaWNNd1VKWCtNUlZHcEg1dGpWSUxvWGw0K29Va3ox?=
 =?utf-8?B?UDV1OEpJUjhVRlVNVGpJUGNVNlhWd1N0d0J5Q09BOE9qODVGZUFNMWRlM2FN?=
 =?utf-8?B?amsxZmtMQnhTSXI4UlZ6aDkxTXRrcVRocE52bnUwbVUrME9CSDRvaXIxcVhS?=
 =?utf-8?B?dWVSQnRMU09EaEdKZUpzaXI2RE1CWm4wSUwzUVdLVEtKdy9mNFNERlF2NW8r?=
 =?utf-8?B?UzdpaXVtN0FqVGZaOVp1bnZpOGEwRXpBZS9FaXR0ZEI0NktuL1QzRWFaVFR6?=
 =?utf-8?B?T3NIRUVtbi9xS0RGcGNxRXNsaU9Lek9FQlZUSWl1dEpQVDRjaGNjMktkazVL?=
 =?utf-8?B?YkM4S0t2TGtFVXYzVmpTRGNJckNCeVNyR2oxK09FVmJEWGgvek9CV2NzZ2tt?=
 =?utf-8?B?ZG9SaGdTeXduR2J6WmgyS1pQZGpnZ29pdVBkOHJhOEE3RnM2VlRJNXBJcVoy?=
 =?utf-8?B?bmhuRk85WWN6OWV2Vy9sMzM1akE2dVViQnBOa1Z5UC9RNENKMnI0RnZJNmMz?=
 =?utf-8?B?ZlptM0IvZXY0cHg5S2MrRGdGQXVCZmx3UUlnd3ZJNXVRZUUybEhQRk5wZUpD?=
 =?utf-8?B?TEFNNTdBMk04RHVHTk1oWDNqVGRKYXJ5MVByTlNabHBObW1sdzJXNmJtYXJN?=
 =?utf-8?B?bm1pMy9XUWZMS3N0K3pTam43TWlYMzEwRlNtWUJzRVFpcWl5czJMSEc4TDFI?=
 =?utf-8?B?ZDZvS3J5elRGSHkzK0ZXYjdBOUZCelZNaDA4ZTg0UkRPZmE3bklaTGdQWWo2?=
 =?utf-8?B?NUZybXZtYlZYZEJ2Q1VNalJCcEs2ckZRYy9Sb3NzQmxwN2lvN2RGYVkwbWhG?=
 =?utf-8?B?SDYwRUpmbHRKS3EvUS8va3J2N1NyTUNkR0wySzNsSjEvM0lkeTdhYXNJZTFy?=
 =?utf-8?B?YXZ1K1pNcnB4dG9SR0hyWW10RUwyUDBLbjlZTFdxVzdwcFI5NENkRUFqaUhn?=
 =?utf-8?B?SWNkNFlGLytZV1VlZVdXVDNhdnRpcWhWa0paamc2RGJ4b2pMcnAwUEdjV1lH?=
 =?utf-8?B?U0M1TU5BblQ2VzNLMlA3V3JvWDBPd09neHl4cGwvd2ZsdlNIcUJnMENkWC9r?=
 =?utf-8?B?V1MwUi9mTGRJN3d2eUNaU2pSN0FKVlRjNSsvQTJEdWFTN0dsQWs4TEdGcHph?=
 =?utf-8?B?THNvbklJTVpwZTBMdk5qVGVyTThSNTczQ2pDemh6Qll5dnRocGEwYXk1MGpF?=
 =?utf-8?B?UFVvUStkdEhzVWVPeFZiT0hSdFV3RXkvWDJiazEzMVpMM3hac3h2VVR4MFFp?=
 =?utf-8?B?UHVqY3hHQWt4YUhwWDkrdS84NHpCNFV4ellvYXdtc1BQSDNqVFZqYXJzWVdE?=
 =?utf-8?B?TjVwZ244bkhDa0hUSktHVndSbk5oSFd5R0RYelpnM0drMjYxSkE3alpidEdB?=
 =?utf-8?B?REVjQVMyK0RKTnVWakJtNG0rOWhNa0JjdDJJcDlhckIybThTdEQvbWZBSkVo?=
 =?utf-8?B?MFMvTGM0amU1b3JINzNOSjFySXk3aExtYjdnOTlncnZ6dm1HRDFadVpsMy82?=
 =?utf-8?B?bURBT0hwTUQzNVBVV2E2Y2IvSXZLeVRzSXU4Y2daOGhNSkxabDdRR1pUNVBV?=
 =?utf-8?B?U3NDT2o2YVdkcTUzZ1BySnoxcjNsL0NYdDc4MFhBVklYc2lKVmZzcjcwTFgz?=
 =?utf-8?Q?8J8O+WGQOml3rUTjWTrIL+lCl?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7848cc99-8a7a-4d4b-16d8-08da6b4b1fb0
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB2941.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:59:22.6105
 (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: s8NLOWQBxr2LFmmPA5kjki9M/pv6eZ37C+MMjgk5XEo8BOlllhXJ0COs1yhB7W4sE+GRPIRq/vG1lB2hna8bHg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6579
X-Spam-Status: No, score=-2.1 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-07-20 15:32, Melissa Wen wrote:
> The -mno-gnu-attribute option in dcn301 clk mgr makefile hides a soft vs
> hard fp error for powerpc. After removing this flag, we can see some FPU
> code remains there:
> 
> gcc-11.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld:
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o uses
> hard float,
> drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.o
> uses soft float
> 
> Therefore, remove the -mno-gnu-attribute flag for dcn301/powerpc and
> move FPU-associated code to DML folder.
> 
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   .../gpu/drm/amd/display/dc/clk_mgr/Makefile   |  6 --
>   .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c    | 86 ++-----------------
>   .../display/dc/clk_mgr/dcn301/vg_clk_mgr.h    |  3 +
>   .../amd/display/dc/dml/dcn301/dcn301_fpu.c    | 74 ++++++++++++++++
>   4 files changed, 84 insertions(+), 85 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> index 15b660a951a5..271d8e573181 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> @@ -123,12 +123,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN30)
>   ###############################################################################
>   CLK_MGR_DCN301 = vg_clk_mgr.o dcn301_smu.o
>   
> -# prevent build errors regarding soft-float vs hard-float FP ABI tags
> -# this code is currently unused on ppc64, as it applies to VanGogh APUs only
> -ifdef CONFIG_PPC64
> -CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn301/vg_clk_mgr.o := $(call cc-option,-mno-gnu-attribute)
> -endif
> -
>   AMD_DAL_CLK_MGR_DCN301 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn301/,$(CLK_MGR_DCN301))
>   
>   AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN301)
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
> index f310b0d25a07..65f224af03c0 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
> @@ -32,6 +32,10 @@
>   // For dcn20_update_clocks_update_dpp_dto
>   #include "dcn20/dcn20_clk_mgr.h"
>   
> +// For DML FPU code
> +#include "dml/dcn20/dcn20_fpu.h"
> +#include "dml/dcn301/dcn301_fpu.h"
> +
>   #include "vg_clk_mgr.h"
>   #include "dcn301_smu.h"
>   #include "reg_helper.h"
> @@ -526,81 +530,6 @@ static struct clk_bw_params vg_bw_params = {
>   
>   };
>   
> -static struct wm_table ddr4_wm_table = {
> -	.entries = {
> -		{
> -			.wm_inst = WM_A,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.72,
> -			.sr_exit_time_us = 6.09,
> -			.sr_enter_plus_exit_time_us = 7.14,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_B,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.72,
> -			.sr_exit_time_us = 10.12,
> -			.sr_enter_plus_exit_time_us = 11.48,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_C,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.72,
> -			.sr_exit_time_us = 10.12,
> -			.sr_enter_plus_exit_time_us = 11.48,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_D,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.72,
> -			.sr_exit_time_us = 10.12,
> -			.sr_enter_plus_exit_time_us = 11.48,
> -			.valid = true,
> -		},
> -	}
> -};
> -
> -static struct wm_table lpddr5_wm_table = {
> -	.entries = {
> -		{
> -			.wm_inst = WM_A,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.65333,
> -			.sr_exit_time_us = 13.5,
> -			.sr_enter_plus_exit_time_us = 16.5,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_B,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.65333,
> -			.sr_exit_time_us = 13.5,
> -			.sr_enter_plus_exit_time_us = 16.5,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_C,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.65333,
> -			.sr_exit_time_us = 13.5,
> -			.sr_enter_plus_exit_time_us = 16.5,
> -			.valid = true,
> -		},
> -		{
> -			.wm_inst = WM_D,
> -			.wm_type = WM_TYPE_PSTATE_CHG,
> -			.pstate_latency_us = 11.65333,
> -			.sr_exit_time_us = 13.5,
> -			.sr_enter_plus_exit_time_us = 16.5,
> -			.valid = true,
> -		},
> -	}
> -};
> -
> -
>   static unsigned int find_dcfclk_for_voltage(const struct vg_dpm_clocks *clock_table,
>   		unsigned int voltage)
>   {
> @@ -670,10 +599,9 @@ static void vg_clk_mgr_helper_populate_bw_params(
>   		/*
>   		 * WM set D will be re-purposed for memory retraining
>   		 */
> -		bw_params->wm_table.entries[WM_D].pstate_latency_us = LPDDR_MEM_RETRAIN_LATENCY;
> -		bw_params->wm_table.entries[WM_D].wm_inst = WM_D;
> -		bw_params->wm_table.entries[WM_D].wm_type = WM_TYPE_RETRAINING;
> -		bw_params->wm_table.entries[WM_D].valid = true;
> +		DC_FP_START();
> +		dcn21_clk_mgr_set_bw_params_wm_table(bw_params);
> +		DC_FP_END();
>   	}
>   
>   }
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
> index 7255477307f1..75884f572989 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
> @@ -29,6 +29,9 @@
>   
>   struct watermarks;
>   
> +extern struct wm_table ddr4_wm_table;
> +extern struct wm_table lpddr5_wm_table;
> +
>   struct smu_watermark_set {
>   	struct watermarks *wm_set;
>   	union large_integer mc_address;
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c
> index e4863f0bf0f6..7ef66e511ec8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c
> @@ -214,6 +214,80 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_01_soc = {
>   	.urgent_latency_adjustment_fabric_clock_reference_mhz = 0,
>   };
>   
> +struct wm_table ddr4_wm_table = {
> +	.entries = {
> +		{
> +			.wm_inst = WM_A,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.72,
> +			.sr_exit_time_us = 6.09,
> +			.sr_enter_plus_exit_time_us = 7.14,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_B,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.72,
> +			.sr_exit_time_us = 10.12,
> +			.sr_enter_plus_exit_time_us = 11.48,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_C,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.72,
> +			.sr_exit_time_us = 10.12,
> +			.sr_enter_plus_exit_time_us = 11.48,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_D,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.72,
> +			.sr_exit_time_us = 10.12,
> +			.sr_enter_plus_exit_time_us = 11.48,
> +			.valid = true,
> +		},
> +	}
> +};
> +
> +struct wm_table lpddr5_wm_table = {
> +	.entries = {
> +		{
> +			.wm_inst = WM_A,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.65333,
> +			.sr_exit_time_us = 13.5,
> +			.sr_enter_plus_exit_time_us = 16.5,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_B,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.65333,
> +			.sr_exit_time_us = 13.5,
> +			.sr_enter_plus_exit_time_us = 16.5,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_C,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.65333,
> +			.sr_exit_time_us = 13.5,
> +			.sr_enter_plus_exit_time_us = 16.5,
> +			.valid = true,
> +		},
> +		{
> +			.wm_inst = WM_D,
> +			.wm_type = WM_TYPE_PSTATE_CHG,
> +			.pstate_latency_us = 11.65333,
> +			.sr_exit_time_us = 13.5,
> +			.sr_enter_plus_exit_time_us = 16.5,
> +			.valid = true,
> +		},
> +	}
> +};
> +
>   static void calculate_wm_set_for_vlevel(int vlevel,
>   		struct wm_range_table_entry *table_entry,
>   		struct dcn_watermarks *wm_set,

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