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: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 52598fbc9b39db0c08705216b5e88bedf950c9cf..4193289ae82f54de96750ad3606a1b231380fe7d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 51afc92994a80d1ee525067102287913ce82bf86..4dd944a93cf1f0a320aa949e5e4c75afce7ef8f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 344202870aebec2d3a24d6c23c4f94c26019686a..dc7aab68ed663042b6182174cb17c339d99bc215 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 8562ac7f7ff041470d811c64024d666390e1ddde..dff66e1ae7eacc8afccc3c0b29fdeded10521d04 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -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)) &&

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index 1cadd3cb26a97e9424d7d0131baf96ac4872a85d..3b6990ef403ad3f26d3112811736d1581dec2117 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -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))

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index e0527e5ed7d16b10113a3184f8ab7086cb90e5fb..7e837acffa6eb0ddf373e9b7e03f26868fc9abfa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index 0ccb7523bc550a7ff0acf3968ea8e45728f79514..86661f9653fa7a1802b167c6c5c54b8b7256ab33 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 4d6de77d289eadc1248458e03bbc56d8a1562d27..2c0c2e9f2783187d613bc62a95898215241f92ca 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -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;