Commit 161d076c authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

drm/amd: Drop error message about failing to load SDMA firmware

The error path for SDMA firmware loading is unnecessarily noisy.
When a firmware is missing 3 errors show up:
```
amdgpu 0000:07:00.0: Direct firmware load for amdgpu/green_sardine_sdma.bin failed with error -2
[drm:sdma_v4_0_early_init [amdgpu]] *ERROR* Failed to load sdma firmware!
[drm:amdgpu_device_init [amdgpu]] *ERROR* early_init of IP block <sdma_v4_0> failed -19
```

The error code for the device init is bubbled up already, remove the
second one.
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2b44d0a4
......@@ -943,10 +943,8 @@ static int cik_sdma_sw_init(void *handle)
int r, i;
r = cik_sdma_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
/* SDMA trap event */
r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 224,
......
......@@ -852,10 +852,8 @@ static int sdma_v2_4_sw_init(void *handle)
return r;
r = sdma_v2_4_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
......
......@@ -1130,10 +1130,8 @@ static int sdma_v3_0_sw_init(void *handle)
return r;
r = sdma_v3_0_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
......
......@@ -1720,10 +1720,8 @@ static int sdma_v4_0_early_init(void *handle)
int r;
r = sdma_v4_0_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
/* TODO: Page queue breaks driver reload under SRIOV */
if ((amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 0, 0)) &&
......
......@@ -1246,10 +1246,8 @@ static int sdma_v4_4_2_early_init(void *handle)
int r;
r = sdma_v4_4_2_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
/* TODO: Page queue breaks driver reload under SRIOV */
if (sdma_v4_4_2_fw_support_paging_queue(adev))
......
......@@ -1368,10 +1368,8 @@ static int sdma_v5_0_sw_init(void *handle)
return r;
r = sdma_v5_0_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
......
......@@ -1232,10 +1232,8 @@ static int sdma_v5_2_sw_init(void *handle)
}
r = amdgpu_sdma_init_microcode(adev, 0, true);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
......
......@@ -1283,10 +1283,8 @@ static int sdma_v6_0_sw_init(void *handle)
return r;
r = amdgpu_sdma_init_microcode(adev, 0, true);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");
if (r)
return r;
}
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment