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: <142b8bf0-c725-31d1-6a04-6038d8b06c83@amd.com>
Date:   Thu, 21 Jul 2022 14:54:36 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 1/5] drm/amd/display: fix soft-fp vs hard-fp on DCN 3.1
 family for powerpc
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-2-mwen@igalia.com>
From:   Rodrigo Siqueira Jordao <Rodrigo.Siqueira@amd.com>
In-Reply-To: <20220720193208.1131493-2-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?OUdVRlY1czVMVFV3OG4wZlBHaGtUMzJkWENNRFExQ1ZiVGEwUDVSYUF2V0RT?=
 =?utf-8?B?WUxBczZCVW9sbXhScndjaUFoZERMT0J4YS95UVlETS9ra2VoZFYrak56cjdO?=
 =?utf-8?B?NkNEL1grcVpDZWRCbEhmSFM5R1hPczJWZFRHckFwMTBRK2ZXajViWU1mTGJ1?=
 =?utf-8?B?Q2tIbVVCbjRPUWtBTERCL3NndWJkenlGYWI3ajRBUTE3RlFUcVdhY3Y2N1pm?=
 =?utf-8?B?NXM0Zjc2aHE2b2NVVDZBMzcvZDVLbEJ6eHJpeTNpZWdWRWNrYWhsUWNNNGxM?=
 =?utf-8?B?TWpob2h4cUFCeUUycjlkUHpwM2UzQ0RtYURmcVZQOURqaG1hYmhNK2lwNFp2?=
 =?utf-8?B?d2F3bi8wS1B6ZkdDYnUrVUNPaVVWNy9ORzNUZ25GMnRRM01LMGlKUFpVNW1H?=
 =?utf-8?B?YUlvcXUyY3Q3ZjRTSDY5R2F2YjdiY21EdTFSS3dCVEJxVjA0N1pKODRNSkk0?=
 =?utf-8?B?dEFqaUZGU3YxMHliK2ZRcVJSUmVLUWJHM29nWkdWSW4vUjBxeGY5TVNWZlFH?=
 =?utf-8?B?MGJnK3VGRHQvcWN1Rjd0N0UwVHFQcUxIbThlclJmVzRhRlpRYlN2Zk9XRHlR?=
 =?utf-8?B?ZGZORDlUWk54UU1pU3hBMGZWZERHc2RqcUtlTEMweDExU3R4djdCVVpPbXcv?=
 =?utf-8?B?MWp6a2c0NlhFQ0dvd0NWTE5sZkdkUUFlWnJ4cHhaOHBmM2M0TjFaeHpLNnBi?=
 =?utf-8?B?R0JoeHc1UUlOSFBXa2tEdXk3NE5NekUzUmkvSGNvVzJxSXlPaTlBcys3TzVD?=
 =?utf-8?B?R0cxR054TklRd2ZGREQwYjRGNDhUUksvM2tGd2NYSTlPQ1FHRm9qRGJhUUJs?=
 =?utf-8?B?Qllkd2FLamJ5SG5USWhkajQ3bTJtTmt6blN4enlVeWRPQkVNNnJKd2hmNEUv?=
 =?utf-8?B?QlY5TW1xMTJab2ZTWUhpSzUvYkZVZVFmL1pQV25rWlI5YU5rNzVxRHZyQkgv?=
 =?utf-8?B?T0dTMEpMc2dhVEVMUWt2ZFFoWVBtaWxkaHBscE5zQk1HU3NPT2lCemlIOVh4?=
 =?utf-8?B?Kyt5OE1ENkJvYklWenRLTGw3K3JxR0JGK0FML2doRDFTaUhOUElxejF4NW5s?=
 =?utf-8?B?Vm00b294VDQrN1ZoQUQvdmlkWjlqRVp4dlJiWEVhNENzODNIYnI2RGRmZGFq?=
 =?utf-8?B?elJQSUtZWjlZcUs1OFA4MDlxdDgycEdwRTZJWEJjQnJPU3JUdXFZSCtQL2hU?=
 =?utf-8?B?UkxNZlhrNGFGZnpmVGxjdXlYRit5dmlpZW5yTDNGVDV1MFVyaEV4bmhERXVp?=
 =?utf-8?B?QmgrK091SGVSQ0hwOHNMMHBKM2YyemJMQ0tkcjZ4WVY3NExYK0N1aVZzOVo4?=
 =?utf-8?B?ZkhFQkROak9jTXp1ZFl6UlRLQWd5MHlZNEtoWEFJZW5KRXppVnVvZXorRkJT?=
 =?utf-8?B?S3EwQnlLZjJkWTErbytwZ29HN2ZWNWZrVkhoMDhLbzVTdjloanRXdHpYNW5R?=
 =?utf-8?B?eGFyQXlHMU9vZkVrRHZwclYwNUgzQ3NZRHpyUGlMODJycmIvMVd0NGt3NDMx?=
 =?utf-8?B?UXE3WTZPM3MvSUs5NEZKZ2I2cmJDSWdqT3ZqNFcyWk03eFkySVgvdDdWZUpq?=
 =?utf-8?B?eVZUclJRdGJrMHBpelM2QitSN3BHa25DaGxvRUlDVE1Kb241UEUxOUV6Ynp2?=
 =?utf-8?B?SFpNUEdLd1VnN29IS1h0KzFHL1NBUjZKazc4U0RHc3l0WUZHYWFzbUdrSjgy?=
 =?utf-8?B?L3pZdlZKQmg3RkxLc09Pend0UG5hUjZ1cXdBTVMyT3V5R1k1d0hHUzg1R2xW?=
 =?utf-8?B?YXhzZkFvdjNaMW9QUkhmZHhUSHZ4elRYKzIzL096TmdXZ2Q5SUFYb3gzUEpT?=
 =?utf-8?B?TWJNMXl4TTd1MVgzV2dEd2hlR3BUdTFyWjJVVzlNbjhVRkxUNnhvazZXaTZ5?=
 =?utf-8?B?NmYwRHp5VGNLMlF2OXd6RHFHVThSSHBNejB1YXNsTnJTWXdNRk9nK2NiYmVx?=
 =?utf-8?B?VjRseGQ4cUdSQmE4L2ZCVGxXRnZLbWNac1hheERlT3MrMS92cGE5dHdiWGQw?=
 =?utf-8?B?Y2p0N2FTQ0VWbG5kcWNra0RtZDhVZjZHa1ZyQnlCU2hMSnRrN3VRUFJraG9u?=
 =?utf-8?B?RTRYcUJNd01nNW1KNnpRdjU2QW5UK3FzUGlNeW1DNS9WbVJKU3Z2WkpuU1Vn?=
 =?utf-8?Q?SXDsUFklMZF0ha3hc/dd7aE+f?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 410e23ee-604d-4d20-12f0-08da6b4a7669
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:54:38.6727
 (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: U0ZOMrwbrdLuRXmzGQPZs9C6lUmgGeppW+vWx4b1oJxgHG8Jqz+6gsbEcus+b+hKvdj5AModHBfc/x37pXVE7A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6476
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:
> Move remaining FPU code to DML folder that caused compilation error for
> powerpc. This patch depends on [1] to prevent the error below:
> 
> /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/dcn31/dcn31_resource.o uses soft float
> /gcc-11.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/amdgpu/../display/dc/dcn31/dcn31_resource.o
> /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/dcn315/dcn315_resource.o uses soft float
> /gcc-11.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/amdgpu/../display/dc/dcn315/dcn315_resource.o
> /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/dcn316/dcn316_resource.o uses soft float
> /gcc-11.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/amdgpu/../display/dc/dcn316/dcn316_resource.o
> 
> [1] https://lore.kernel.org/amd-gfx/20220716195144.342960-1-mwen@igalia.com/
> 
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c |  5 +++--
>   .../gpu/drm/amd/display/dc/dcn315/dcn315_resource.c   |  5 +++--
>   .../gpu/drm/amd/display/dc/dcn316/dcn316_resource.c   |  5 +++--
>   drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c  | 11 +++++++++++
>   drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h  |  3 +++
>   5 files changed, 23 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 178d40c0d70a..929b712cbada 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> @@ -1663,11 +1663,12 @@ int dcn31_populate_dml_pipes_from_context(
>   		pipes[pipe_cnt].pipe.src.immediate_flip = true;
>   		pipes[pipe_cnt].pipe.src.unbounded_req_mode = false;
>   		pipes[pipe_cnt].pipe.src.gpuvm = true;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_luma = 0;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_chroma = 0;
>   		pipes[pipe_cnt].pipe.dest.vfront_porch = timing->v_front_porch;
>   		pipes[pipe_cnt].pipe.src.dcc_rate = 3;
>   		pipes[pipe_cnt].dout.dsc_input_bpc = 0;
> +		DC_FP_START();
> +		dcn31_zero_pipe_dcc_fraction(pipes, pipe_cnt);
> +		DC_FP_END();
>   
>   		if (dc->debug.dml_hostvm_override == DML_HOSTVM_NO_OVERRIDE)
>   			pipes[pipe_cnt].pipe.src.hostvm = dc->res_pool->hubbub->riommu_active;
> 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 df2abd8fe2eb..1a5f5977f962 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> @@ -1658,11 +1658,12 @@ static int dcn315_populate_dml_pipes_from_context(
>   
>   		pipes[pipe_cnt].pipe.src.unbounded_req_mode = false;
>   		pipes[pipe_cnt].pipe.src.gpuvm = true;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_luma = 0;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_chroma = 0;
>   		pipes[pipe_cnt].pipe.dest.vfront_porch = timing->v_front_porch;
>   		pipes[pipe_cnt].pipe.src.dcc_rate = 3;
>   		pipes[pipe_cnt].dout.dsc_input_bpc = 0;
> +		DC_FP_START();
> +		dcn31_zero_pipe_dcc_fraction(pipes, pipe_cnt);
> +		DC_FP_END();
>   
>   		if (pipes[pipe_cnt].dout.dsc_enable) {
>   			switch (timing->display_color_depth) {
> 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 070fe10a004e..53dea466348f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> @@ -1661,11 +1661,12 @@ static int dcn316_populate_dml_pipes_from_context(
>   
>   		pipes[pipe_cnt].pipe.src.unbounded_req_mode = false;
>   		pipes[pipe_cnt].pipe.src.gpuvm = true;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_luma = 0;
> -		pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_chroma = 0;
>   		pipes[pipe_cnt].pipe.dest.vfront_porch = timing->v_front_porch;
>   		pipes[pipe_cnt].pipe.src.dcc_rate = 3;
>   		pipes[pipe_cnt].dout.dsc_input_bpc = 0;
> +		DC_FP_START();
> +		dcn31_zero_pipe_dcc_fraction(pipes, pipe_cnt);
> +		DC_FP_END();
>   
>   		if (pipes[pipe_cnt].dout.dsc_enable) {
>   			switch (timing->display_color_depth) {
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
> index facac3daeaca..e36cfa5985ea 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
> @@ -435,8 +435,19 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_16_soc = {
>   	.urgent_latency_adjustment_fabric_clock_reference_mhz = 0,
>   };
>   
> +void dcn31_zero_pipe_dcc_fraction(display_e2e_pipe_params_st *pipes,
> +				  int pipe_cnt)
> +{
> +	dc_assert_fp_enabled();
> +
> +	pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_luma = 0;
> +	pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_chroma = 0;
> +}
> +
>   void dcn31_update_soc_for_wm_a(struct dc *dc, struct dc_state *context)
>   {
> +	dc_assert_fp_enabled();
> +
>   	if (dc->clk_mgr->bw_params->wm_table.entries[WM_A].valid) {
>   		context->bw_ctx.dml.soc.dram_clock_change_latency_us = dc->clk_mgr->bw_params->wm_table.entries[WM_A].pstate_latency_us;
>   		context->bw_ctx.dml.soc.sr_enter_plus_exit_time_us = dc->clk_mgr->bw_params->wm_table.entries[WM_A].sr_enter_plus_exit_time_us;
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
> index 0a10de80c1a4..4372f17b55d4 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
> @@ -31,6 +31,9 @@
>   #define DCN3_15_MIN_COMPBUF_SIZE_KB 128
>   #define DCN3_16_DEFAULT_DET_SIZE 192
>   
> +void dcn31_zero_pipe_dcc_fraction(display_e2e_pipe_params_st *pipes,
> +				  int pipe_cnt);
> +
>   void dcn31_update_soc_for_wm_a(struct dc *dc, struct dc_state *context);
>   
>   void dcn31_calculate_wm_and_dlg_fp(

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