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: <6c1264f7-3165-d23d-0c4e-d8b992d054c3@amd.com>
Date:   Thu, 5 Jan 2023 12:18:44 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH v6 42/45] drm/amd: Use `amdgpu_ucode_*` helpers for DMCU
Content-Language: en-US
To:     Mario Limonciello <mario.limonciello@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        linux-kernel@vger.kernel.org
Cc:     Javier Martinez Canillas <javierm@redhat.com>,
        Carlos Soriano Sanchez <csoriano@redhat.com>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, christian.koenig@amd.com,
        Lazar Lijo <Lijo.Lazar@amd.com>, Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>
References: <20230105034327.1439-1-mario.limonciello@amd.com>
 <20230105034327.1439-43-mario.limonciello@amd.com>
From:   Harry Wentland <harry.wentland@amd.com>
In-Reply-To: <20230105034327.1439-43-mario.limonciello@amd.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UnBJZmxKaGNzUjBqZlRyTzdiYWwzV2JlUmltTFVzRUJmRVI5UzZYcHZGTXM3?=
 =?utf-8?B?amw1YTI0WEtKOUJPVnhmQlFuZFpwc3dzRk5rU0FSTE5xdGl5dUR0SjNRUWxI?=
 =?utf-8?B?bnd6QlludEFlbUxObk9XQkdtYUtSYUR6S1lZZEY0bGxKdlVEbXNuZkdTU0dv?=
 =?utf-8?B?L0lDSDhLdXlYVVJ4R3o2dFZXVzJJaEtDS0NHeVJWQXV0YkVHSXc0ZEVVZ0R6?=
 =?utf-8?B?dkZNUWNpN0JJSGp6bGhZZlRYeWxwcGFNeE9xWkdhY3phT2cwVi96YkpQOXFM?=
 =?utf-8?B?ZE95RDhRUXhJRkdPU0V6ZDFlb0JPV0dSc2kvcUY5a1UxcDdCUUdaSjBDT0NU?=
 =?utf-8?B?NWk4MmRRS2lJRmhxa3dsZDBXWTZIalJUZVVKRkh3WjNFeHRsajNhM0JvZFh0?=
 =?utf-8?B?dzZLT2x0b2NHUUNhZVd2WHBXa3h4ZTNud3dMSE1OMUhSaEZlbWYyUEVBbVlB?=
 =?utf-8?B?VHA1OGRsWWw2dTNLVDROZTk3UUVwMW5weElwU1owY3U2R2dyZTNYd0xMeUla?=
 =?utf-8?B?L0NzWSt0a1JUbGx1U3h6Mlp5Mjl2Z1ZKaUVGbmN0SDZkUldTNDNMZFJkZ3Fh?=
 =?utf-8?B?OUFKZE9PTklaYXc5Nmh3TVd1YXFBbWNOUi9JOXZWS3ozU2VPVk9STFYzMlJk?=
 =?utf-8?B?bnFrTlRPZFBxRHUwR2xJbEZzaFlYTTY3ckhFSHM4T0N1VzhxWG5NamNZQ3Rm?=
 =?utf-8?B?UlZ6VjlGdXEyZUVBSWJCdjdGM2dXVnF1aTdmL2UrR1h2VTBHZGM1ZXJsWWFk?=
 =?utf-8?B?cE9LK3E3UVM4UzB5aGlVaWFNMU1XRGlsZE0wbkpIbU9GYy83RWQ0SGprbS9x?=
 =?utf-8?B?UDBHZjd6d0lLQkZ5dEZ2SFlxNVVCSHFOVUorYkZZQ1hvbHRaa3dad05CNHQ2?=
 =?utf-8?B?cU5LVUdFa1JySVNBZjdMcDRqVG9IRXUxeGtmRlhMdVRuRUFmYmJyWi90c21U?=
 =?utf-8?B?eTlRUCtDV05RY3JUaW5oRGdSUDhlRVhxM2NHcHVLUUxMMEE2TUhYaDNQOCtB?=
 =?utf-8?B?MG96anR3Q1c0RFp2bWZKR2lMQWpPSkxQTG1jQW5ZQkJ1R3J2NDRwYm50WUE4?=
 =?utf-8?B?SXZBL1ZjelkwVUora01lclYzS3o1NWU2N2h5ZUV6TkpmNVdDdm9oejJWemc5?=
 =?utf-8?B?YTg4Z2JQem5LSk9hYjdpdEZ0Qk5mc2RncFdUTS9CelE4WXg2Tk8yQ3dFdkFi?=
 =?utf-8?B?dlFvT25jWlBmMGliRFlyZ2lEOVU1VEVhWXQ1U3J2cGU3RDVyRCtpT0dPNk9B?=
 =?utf-8?B?NFJDSUxGRGZ3ajhUSE5LMlhVR1Nlak1DOWxyUmEyYUZ6elYveFhIcEE3bkhp?=
 =?utf-8?B?V2NlbjBITCt3MHY5NmJUSzBRRVRUaWpFWExUU1lQajVnZzB4YzlTTCtyRDFG?=
 =?utf-8?B?WTdjSU9OTnA0ckIvNjBHbGRNT0JXdlNKL3lQcHg2ZERHeDJQbWtIVkJ2bkdS?=
 =?utf-8?B?VFMxME56OGtOem9NTDlNb2djUTVueldMSkhNYkM5N01tZ3Fycm9DZldpcTQy?=
 =?utf-8?B?L2xVZVJneU5ZTXhoTWovT3BoQjhENG9hVDBDRnVWMHp1YS9qYlAyRkJWd0ow?=
 =?utf-8?B?YWdXNHJnQmhvVU45SUtKZEgzSHRsWkF6RURhN29HcUlWSHR0ZlQ3UXhhUElF?=
 =?utf-8?B?dTVDMHJCN3NSaWVBT3MyOGU4cTZsOUpKaHgxbVBqNTI2OGZ2MFgrTmF4b2ZV?=
 =?utf-8?B?ZTBtUEhZR0ttVlpkSGNXWkdTbTh4YUVsbWxVcXhXWm02RWtRcnV1dUpxR1F6?=
 =?utf-8?B?U3huK0lIMld2VWRWUUJnZGZGekR6Um1FN1lhRHB6c0t0RGJERmkyaFpVaFlC?=
 =?utf-8?B?WUdtZEJLbEE1MFgrVzhsRjNPNEppaTVpNG9NK2JodmhFUkJNaXRwRFBLMVEy?=
 =?utf-8?B?ZzRGY3BPNXlFWDVGamJLRGJFWVU2YWExbmFESVBWQXZrZ2ZEWnBVNUJiY0dq?=
 =?utf-8?B?S1RXQlJRWmQ5SCtQSmxmYm81Ky91R0E5bEJwRXF1SXl5VUU5bUtqVUluQjRq?=
 =?utf-8?B?UVFmL1h5UFJ6RFZWVG4yVEFxUkxCeUlrQVQwTk5tSTFlQ2Q5U0FWOVhjN2pw?=
 =?utf-8?B?dDg4MDBCQnR0QWFZMUkxbHcxbnpna1Jqb1FlOW83MnZCcHVuWExaeFpWeXFU?=
 =?utf-8?Q?e+FVxaEC4XFvWu1LE8ZIFRP92?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c34fe745-6585-45f3-32b2-08daef40e858
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 17:18:48.3417
 (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: CS7JjDKpdcR1viw6cdvU/SRQwwsZbASUxuwfkYuneUczYe9HY05ko+NcFZzqqtoRupZc3z7N3SiGyJymtVlqUg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7966
X-Spam-Status: No, score=-5.0 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 1/4/23 22:43, Mario Limonciello wrote:
> The `amdgpu_ucode_request` helper will ensure that the return code for
> missing firmware is -ENODEV so that early_init can fail.
> 
> The `amdgpu_ucode_release` helper is for symmetry on unloading.
> 
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 61c192ead62f..79c4652e8e40 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1881,20 +1881,13 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
>  		return 0;
>  	}
>  
> -	r = request_firmware_direct(&adev->dm.fw_dmcu, fw_name_dmcu, adev->dev);
> -	if (r == -ENOENT) {
> +	r = amdgpu_ucode_request(adev, &adev->dm.fw_dmcu, fw_name_dmcu);
> +	if (r == -ENODEV) {
>  		/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */
>  		DRM_DEBUG_KMS("dm: DMCU firmware not found\n");
>  		adev->dm.fw_dmcu = NULL;
>  		return 0;
>  	}
> -	if (r) {
> -		dev_err(adev->dev, "amdgpu_dm: Can't load firmware \"%s\"\n",
> -			fw_name_dmcu);
> -		return r;
> -	}
> -
> -	r = amdgpu_ucode_validate(adev->dm.fw_dmcu);
>  	if (r) {
>  		dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n",
>  			fw_name_dmcu);