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: <9910a5e3-a161-edfa-19d4-2bbf3bbf405f@amd.com>
Date:   Mon, 24 Apr 2023 13:02:14 -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?cjE0cStJY0dKSm9WR2hCMUpiL1o1czkxNFJlVTluenJSRVl3Tk5KN0NxM2JX?=
 =?utf-8?B?bXQxZ1M1YmRRS3VnbkhnY2FIOWlNNmltVXNzZDFXMm9QeDMyMDhvdFpWZXE5?=
 =?utf-8?B?Z2traGdrMjJuZFhqcEN1YmdKUWhkcFpLU1Y1Q1M1WElwWXo1cHdVWWsrNm42?=
 =?utf-8?B?L3V1ZllaRERSTWZhaUhYVEJzeFhxdlRSV05aenowVkhrcWtVOGJQMzRSdXBE?=
 =?utf-8?B?OWN0eHIydUtEZkJQWFJxVTFzUUNhNHZKT0JEeGJ4YmEwMHV5L1c2OERzOHZy?=
 =?utf-8?B?ckh5a1hjMHprcmptTTRtTWxrY2hXbUs4emNjVlljOHY0K2VwalMrazhNYTBm?=
 =?utf-8?B?aXlrUDJoYmdUd0R6SnQ3WU5vZ3JEMjJtckErSlJ0cHJLNlBIdG1KZG9WOE5r?=
 =?utf-8?B?K0pDR0g0STRiT2Z5RmZVZDl3aEtrbFhQMmJ5RFgwTDFjZmJ5RWtBMm1tMXE2?=
 =?utf-8?B?SlVOakYzVUQyN25qbXR2U0tlYTU1c2xQTEczZXFPaFNEU0RRWnAzdzgyQUxH?=
 =?utf-8?B?R3NIOEF0RWE1aVVIVkgrQTR4VThMamdqdVNFVFFFeklHWURpT1FIQ28rWHpD?=
 =?utf-8?B?SnFNSkhkdk9CU0RyZTNTb08rWkxoNDU1YlcyLzI1aUVzOWtwZjRUZGlKaTh1?=
 =?utf-8?B?L1pObC95ZWhkYXE1RXBkS0Q3c3lNWFRwU0x3Q2V2TVBrdjN6UmsxVmU0eHZL?=
 =?utf-8?B?NlF3MWNKaWg3ZUlFSkZrcXNuLzBaUW53U0NMMmpoeGR6M0JNdGp3dnZkbnBu?=
 =?utf-8?B?N0IvT2pJUzRlbUllK0FZenFYOTMyYWY5Zm5LMFZYaEpHMlFMQ1UxSGhXbWlF?=
 =?utf-8?B?aFJTQmkwYkdVZ2MySkxpdHI3M1B0aE1aRm4yNzVibFVDc1J4aVc1UFhZVDRT?=
 =?utf-8?B?dG1yWVJCcmVsUkwyT1ZpTTlob2NYQ3ZrQndFOUdIa1Nickw2MjI2cFB6elcw?=
 =?utf-8?B?N0t1Y1Q3OHh2TVRpa2dkN05IWGozdTR1QUlTMllKd2QwWFhNSWV5RzlXWnVB?=
 =?utf-8?B?TGwrYUZxK2lLVk9GNkwyQi8zVlRKOXdlSGZDTk9RcVBYL2NzVWJnTEN4OVpY?=
 =?utf-8?B?Qkk1eXhWRkFCUmY5YWlHMUxCUEM5ZVBJTG1CbHRWRXlTM3pjOUtGVUFwZjBM?=
 =?utf-8?B?K0d1c0x1ZzhNd080aEFnNjZUWXFwWlVRYmZuSml4U3lBTnFUU3ZPZmtTakg5?=
 =?utf-8?B?eFc2SVhyT2RQdlI4bzNZMUVMYjFBNFdXanJoc0duU1N4VFBNUFlJMUxIUkd1?=
 =?utf-8?B?c1ZKand1cXhPSUM0VXBrVURGZUxZR3lNaHBXSnppT1hyY3RlZW92MkQrRVJL?=
 =?utf-8?B?YXMvQ0tpMmhKNVVLOVJzRE5TektYcUxTQVA1ZG5qa0hXbWRSTURrZFl3REE4?=
 =?utf-8?B?Yzd2NlphbFhZNllGQk5odHZwYXdra1N5SjQrOWpsYkRqOGsxSCtMenlPTk10?=
 =?utf-8?B?bmt0dDBqSE02RGlXUkNwUmJadHhQUGhsczJxdnlEdFBPWTRZS3l1ZXFISnpJ?=
 =?utf-8?B?NVJOaEptanpZaUhoRWsrVUtUc1RiZUpmOThaUm9xcWpPeFhtRm0vbTNGSCt0?=
 =?utf-8?B?NW1UY0NicTM3YWZTSms2RitNMUZZNXh5SnBVa2JLM1lKREJMb25PbWsvZmZO?=
 =?utf-8?B?RVZLQ1dwQzNCUXBFY2h2SlZKTEhhQTA3OCs1U1pJUXFFd3VTMjc0R2x3UjZK?=
 =?utf-8?B?cHpCMWQ1bDl4dGZkT09HYkt6S3dHL0dlNERJclJVK3cvV1pUZnptcDB0d0RK?=
 =?utf-8?B?OENNb3ZxdWFCNnpYYUs4L25sN21SbDhQQ2JEeHd0THl1ZWsycWx6VnBVbnJW?=
 =?utf-8?B?UTF5Uk5wVWd0QkpaZzh6MjhxNTU1cjNJU0VuSTRVWUZRK3ZhbHJqUWx6aEhI?=
 =?utf-8?B?VjNob0dCTlpGVmptM1hQTjJGdVF0M2FyL0NBYnU0T3NMei90N21SUlEwOEpP?=
 =?utf-8?B?SldUR0JrRzhwT1hwdmZwaVR2d0JwdFUvMFhTVkE2bUtLYTZkWEZvbDhnN3g2?=
 =?utf-8?B?Ukpuc3BDSlYzYjdDbCs0d3BQSzc5bGlqaWRaYXpNbGdFN0tiL0VhbGl0U0Fh?=
 =?utf-8?B?bDFsdmxvYjJGY3RPTEdTQUpFN0lha2xwNFFHWnhZVUJUUE9wVGtINzRIdVc0?=
 =?utf-8?Q?VYuDEm45ZHEEI+8+pLYtrzIrB?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8239dfa0-5b78-450a-e4c6-08db44e57438
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB6280.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2023 17:00:49.3306
 (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: /A+x2jG7Q28oyuSNQ9CwCEfMVjopG/bvIZy03Tm3j3iKOCk9RdB3jR4f5jFFIGGZwZL6hI5e6NmPQT9qOrwYZA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9040
X-Spam-Status: No, score=-2.3 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 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")

What tree is this based on? I am unable to find that exact commit on
amd-staging-drm-next.

> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>   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