diff mbox series

[v4,25/27] drm/amd: Use `amdgpu_ucode_load` helper for SMU

Message ID	20230103221852.22813-26-mario.limonciello@amd.com
State	New
Headers	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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Mario Limonciello <mario.limonciello@amd.com> To: 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>, Mario Limonciello <mario.limonciello@amd.com>, "Evan Quan" <evan.quan@amd.com>, "Pan, Xinhui" <Xinhui.Pan@amd.com> Subject: [PATCH v4 25/27] drm/amd: Use `amdgpu_ucode_load` helper for SMU Date: Tue, 3 Jan 2023 16:18:44 -0600 Message-ID: <20230103221852.22813-26-mario.limonciello@amd.com> In-Reply-To: <20230103221852.22813-1-mario.limonciello@amd.com> References: <20230103221852.22813-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk
Series	Recover from failure to probe GPU \| [v4,00/27] Recover from failure to probe GPU [v4,01/27] drm/amd: Delay removal of the firmware framebuffer [v4,02/27] drm/amd: Add a legacy mapping to "amdgpu_ucode_ip_version_decode" [v4,03/27] drm/amd: Convert SMUv11 microcode to use `amdgpu_ucode_ip_version_decode` [v4,04/27] drm/amd: Convert SMUv13 microcode to use `amdgpu_ucode_ip_version_decode` [v4,05/27] drm/amd: Add a new helper for loading/validating microcode [v4,06/27] drm/amd: Use `amdgpu_ucode_load` helper for SDMA [v4,07/27] drm/amd: Convert SDMA to use `amdgpu_ucode_ip_version_decode` [v4,08/27] drm/amd: Make SDMA firmware load failures less noisy. [v4,09/27] drm/amd: Use `amdgpu_ucode_load` helper for VCN [v4,10/27] drm/amd: Load VCN microcode during early_init [v4,11/27] drm/amd: Load MES microcode during early_init [v4,12/27] drm/amd: Use `amdgpu_ucode_load` helper for MES [v4,13/27] drm/amd: Remove superfluous assignment for `adev->mes.adev` [v4,14/27] drm/amd: Use `amdgpu_ucode_load` helper for GFX9 [v4,15/27] drm/amd: Load GFX9 microcode during early_init [v4,16/27] drm/amd: Use `amdgpu_ucode_load` helper for GFX10 [v4,17/27] drm/amd: Load GFX10 microcode during early_init [v4,18/27] drm/amd: Use `amdgpu_ucode_load` helper for GFX11 [v4,19/27] drm/amd: Load GFX11 microcode during early_init [v4,20/27] drm/amd: Parse both v1 and v2 TA microcode headers using same function [v4,21/27] drm/amd: Avoid BUG() for case of SRIOV missing IP version [v4,22/27] drm/amd: Load PSP microcode during early_init [v4,23/27] drm/amd: Use `amdgpu_ucode_load` helper for PSP [v4,24/27] drm/amd/display: Load DMUB microcode during early_init [v4,25/27] drm/amd: Use `amdgpu_ucode_load` helper for SMU [v4,26/27] drm/amd: Load SMU microcode during early_init [v4,27/27] drm/amd: Optimize SRIOV switch/case for PSP microcode load

Commit Message

Mario Limonciello Jan. 3, 2023, 10:18 p.m. UTC

  The `amdgpu_ucode_load` helper will ensure that the return code for
missing firmware is -ENODEV so that early_init can fail.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v3->v4:
 * New patch
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 5 +----
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index d4756bd30830..1d693cda5818 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
@@ -109,10 +109,7 @@  int smu_v11_0_init_microcode(struct smu_context *smu)
 
 	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);
 
-	err = request_firmware(&adev->pm.fw, fw_name, adev->dev);
-	if (err)
-		goto out;
-	err = amdgpu_ucode_validate(adev->pm.fw);
+	err = amdgpu_ucode_load(adev, &adev->pm.fw, fw_name);
 	if (err)
 		goto out;
 
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 506a49a4b425..845a7fc83ba8 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -103,10 +103,7 @@  int smu_v13_0_init_microcode(struct smu_context *smu)
 
 	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);
 
-	err = request_firmware(&adev->pm.fw, fw_name, adev->dev);
-	if (err)
-		goto out;
-	err = amdgpu_ucode_validate(adev->pm.fw);
+	err = amdgpu_ucode_load(adev, &adev->pm.fw, fw_name);
 	if (err)
 		goto out;