提交 46fa9075 编写于 作者: M Mario Limonciello 提交者: Alex Deucher

drm/amd: Use `amdgpu_ucode_*` helpers for DMCU

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: NAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: NLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: NHarry Wentland <harry.wentland@amd.com>
Signed-off-by: NMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 b31d3063
...@@ -1883,20 +1883,13 @@ static int load_dmcu_fw(struct amdgpu_device *adev) ...@@ -1883,20 +1883,13 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
return 0; return 0;
} }
r = request_firmware_direct(&adev->dm.fw_dmcu, fw_name_dmcu, adev->dev); r = amdgpu_ucode_request(adev, &adev->dm.fw_dmcu, fw_name_dmcu);
if (r == -ENOENT) { if (r == -ENODEV) {
/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ /* DMCU firmware is not necessary, so don't raise a fuss if it's missing */
DRM_DEBUG_KMS("dm: DMCU firmware not found\n"); DRM_DEBUG_KMS("dm: DMCU firmware not found\n");
adev->dm.fw_dmcu = NULL; adev->dm.fw_dmcu = NULL;
return 0; 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) { if (r) {
dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n", dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n",
fw_name_dmcu); fw_name_dmcu);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册