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: <f7c89749-3870-cd13-542e-5d33fd85ddcf@amd.com>
Date:   Wed, 26 Apr 2023 16:50:44 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.9.1
Subject: Re: [PATCH] drm/amd/display: return status of
 dmub_srv_get_fw_boot_status
Content-Language: en-US
To:     Tom Rix <trix@redhat.com>, harry.wentland@amd.com,
        sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com,
        alexander.deucher@amd.com, christian.koenig@amd.com,
        Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch,
        Alvin.Lee2@amd.com, Jun.Lei@amd.com, qingqing.zhuo@amd.com,
        Max.Tseng@amd.com, Josip.Pavic@amd.com, Eric.Yang2@amd.com,
        aurabindo.pillai@amd.com
Cc:     dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20230420135901.3889747-1-trix@redhat.com>
From:   Hamza Mahfooz <hamza.mahfooz@amd.com>
In-Reply-To: <20230420135901.3889747-1-trix@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZStwSWdtaEQwdmxGdTdqYS9rOHZLNVJkcnRibG1TaHIwa015S1pISkRwa2Jz?=
 =?utf-8?B?TExRb0h3ZytxdkE1WW83R2FFSE9JSVh2T3F4OVVDck9Ca29waU1hTXNWUjZ1?=
 =?utf-8?B?bWQxdXVaNGpYeVpiZkREWjRvd2JjZjBFRDFFdEZhSk5qNSt6TjhtbEZkS2tG?=
 =?utf-8?B?TGVsZ3RidDQ5UHdRWkFaMFliek9MRWl1SWZZZ2NRTjhCYnF1cWpwbnhyNHVP?=
 =?utf-8?B?bXQ5NkxHVzgwYTVGTTR0WHczdXliMDI5REhXQkNJaVRBR1BnVWk1UEJmUGQw?=
 =?utf-8?B?WFlETE5oVFNrTVdhUkMyOVN1SEgwWnpnaGNFTkg2QUlKU3hjTzBwdW1CamtR?=
 =?utf-8?B?VjZWRXNMZGFQZkgzWDRlcUlBTlhreEVhTi9nVVZrOXJjNThSZ20yZ2dPUEMy?=
 =?utf-8?B?cFZidW5wUW4vSmlNME1mMHJNeVdmeHByRHI1amR0Sm5qRW9uZkxzUTdBV3py?=
 =?utf-8?B?dGFPc0ZLcUpIWVVqMWJXeTBRU3JPOFoya2VTZTlIcHd3elBkN1JERUZtNjhv?=
 =?utf-8?B?SHppNlNUYW1ocDh0eE4rU2ZEdHFSUGNsbUc4aFAyTFdoeVNhSi9jWUZEWE4v?=
 =?utf-8?B?VDNuUVhaQWhjSWFsR0o2M3RJYjRnYkg5ZkFibG93a2RBWUlCcGg0SHBpUEk3?=
 =?utf-8?B?YXZjNkk3QjJiYWJsWElvSVg0b0R6YlBEWXV6dWNzTnRhOVBWQWFvVUlGYVpU?=
 =?utf-8?B?OGlXaVdxa3NTb0QzanFOelZZMEZIYjd6ZU9sZzIyWWRlWks1cldCK3NhUTBJ?=
 =?utf-8?B?alpOMjdEalR1OGI4S3hLYnEyQjl6SU9EVFZ4N3QrOVcvaC9KZkdxRllLbWNv?=
 =?utf-8?B?ZFJUTUhQUU1FVXJKcW1BTmJiMlUya0lUc0JLaVJhdkFjNHp5ekVGZzRVeEEy?=
 =?utf-8?B?andiNzF0KzM2N1VQZW5RTTUxQVNmb3hmSWx2Mk13ZkQ1eW40VC82Z0IwRnBR?=
 =?utf-8?B?YkxLWkNhM3NFY1V0UWdKSFc3NFpudTU0QTRYV2xkaFdYQTFYTGpJcDdsZHVD?=
 =?utf-8?B?UFViMGhNY1dZaE5uWERmNm1CR1paZ3QyMG9QOTJNUEFvN3lMRXFZeGlhNlNr?=
 =?utf-8?B?eWwrK0hqM0hTZ0NXUVVGNExkUkNzTWoyU1dvSy9zdWF0NzJWN3VvUVk0NWhZ?=
 =?utf-8?B?MTU3WlZaeE94TXJmYmlwWU1GNmlrQ1JmN0FjcExhVTdlckRHYlV0Q2hpaHVZ?=
 =?utf-8?B?ek9YQkNqTVBOSzVvU2RQMm5hVk1TbHNaSThBdXZrU3lXWW1KRFJPMVhpLzQ5?=
 =?utf-8?B?QWIrUGZMRm13RG9VTXF2NjExT3JrUmRkNjRFNWhIRk80cXRKMkxpMTdmQ0Zx?=
 =?utf-8?B?MW5kR3ZVMGtkM1pSbFZrMDBYeDdwUnFydDU2Y2I0OTB0M0hGcUpKYmdGQ1B4?=
 =?utf-8?B?SFJWK1hxTXdRenBRZ3Z0RjJPN203Tks0RS9JUFRiSXdvVjNZK1hCdC9EcGo3?=
 =?utf-8?B?ZFJhbFNiWDFNTEdncUxlL0g2M1RUdUZpdlAvUDNrQW9QSVhPMzB6MzcwTFlk?=
 =?utf-8?B?WndYeFFLUnZsNzB0YmpCQmh6d2tJOEdWbFVkbnZVZlpMeTZFd01zV3RYS252?=
 =?utf-8?B?bk1LVzRsSXRrOE9aNHRKUTVVYW8vV1JDendheWJMbHpsOGZoWkI3SHk3NUs3?=
 =?utf-8?B?azNTNXRxNDY1MTVyS0pBc2tPZ2hvbzdZYWhpalFnZzdObkg4L2tCYW1icWhI?=
 =?utf-8?B?MmllWks1V0tyN1Uvb044MzVsVXc4K3IxbWtJTTd3T2hLemFhM0FxdVFxYTkw?=
 =?utf-8?B?WnN0TW53SzBLYUQ2V0VLWUNQdFA3bUFLT0x3U2pEM21qZmpTYmhYdHBwalQ2?=
 =?utf-8?B?YUdMVUpxS3VFbW1UdVRLeitiZ1ZsdE13NHhwbElZMGpsUUlYWjF4RVFwR3Ro?=
 =?utf-8?B?UGlSUXRxMEtPbU5GSXg0MFM1QWFpbTlPVlRGMUhEQ1ZVZDBxK2RWZG50dDFU?=
 =?utf-8?B?TzlBUDNHMVhNUEtYVVR4YnJRb3R5dkRVTmxyTGNtMG92eGp0SUJzVXNaOGVj?=
 =?utf-8?B?dlRDTGoxTnZ1azRaeDR5T0ZsMThpK1htSjZvNC9LMU96YVpodVFNMzlmUjNU?=
 =?utf-8?B?OXVuTEVsZ2NsZVNnTVBwdUhHSzM0VHU2R01HTmZ1VEZNS0JEMzdBOU00dTMx?=
 =?utf-8?Q?gCU6yxJBo5Dy8IqytCG6+7hfs?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d8c5ebe7-a350-400b-3e59-08db4697b4c3
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB6280.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 20:49:20.0590
 (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: H8Urg43IdrdGk6eYuYsPIURVIwNlrEIpXsp5Jt+Iusz14Y1CtnVfOvxNntPMCAR7+CahGTikmQsvLX/Kv/LQMg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9023
X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 4/20/23 09:59, Tom Rix wrote:
> gcc with W=1 reports
> drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:
>    In function ‘dc_dmub_srv_optimized_init_done’:
> drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:184:26:
>    error: variable ‘dmub’ set but not used [-Werror=unused-but-set-variable]
>    184 |         struct dmub_srv *dmub;
>        |                          ^~~~
> 
> The return status is never set.
> It looks like a call to dmub_srv_get_fw_boot_status is missing.
> 
> Fixes: 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")
> Signed-off-by: Tom Rix <trix@redhat.com>

Applied, thanks!

> ---
>   drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 13 +++++++++++--
>   1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> index d15ec32243e2..36d936ab4300 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> @@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int coun
>   bool dc_dmub_srv_optimized_init_done(struct dc_dmub_srv *dc_dmub_srv)
>   {
>   	struct dmub_srv *dmub;
> -	union dmub_fw_boot_status status;
> +	struct dc_context *dc_ctx;
> +	union dmub_fw_boot_status boot_status;
> +	enum dmub_status status;
>   
>   	if (!dc_dmub_srv || !dc_dmub_srv->dmub)
>   		return false;
>   
>   	dmub = dc_dmub_srv->dmub;
> +	dc_ctx = dc_dmub_srv->ctx;
> +
> +	status = dmub_srv_get_fw_boot_status(dmub, &boot_status);
> +	if (status != DMUB_STATUS_OK) {
> +		DC_ERROR("Error querying DMUB boot status: error=%d\n", status);
> +		return false;
> +	}
>   
> -	return status.bits.optimized_init_done;
> +	return boot_status.bits.optimized_init_done;
>   }
>   
>   bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,
-- 
Hamza