drm/amdgpu/vcn: Change amdgpu_vcn_sw_fini return to void

The function amdgpu_vcn_sw_fini() returns an integer, but this number is
always 0. This commit changes the amdgpu_vcn_sw_fini() return to void,
and eliminates all checks to this return across different VCNs.

Signed-off-by: Rodrigo Siqueira <siqueira@igalia.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index ad41520..c2f6936 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -257,12 +257,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int i)
        return 0;
 }
 
-int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
+void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
 {
        int j;
 
        if (adev->vcn.harvest_config & (1 << i))
-               return 0;
+               return;
 
        amdgpu_bo_free_kernel(
                &adev->vcn.inst[i].dpg_sram_bo,
@@ -292,8 +292,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
 
        mutex_destroy(&adev->vcn.inst[i].vcn_pg_lock);
        mutex_destroy(&adev->vcn.inst[i].vcn1_jpeg1_workaround);
-
-       return 0;
 }
 
 bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum vcn_ring_type type, uint32_t vcn_instance)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index 6d9acd3..bebfc2b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -516,7 +516,7 @@ enum vcn_ring_type {
 
 int amdgpu_vcn_early_init(struct amdgpu_device *adev, int i);
 int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int i);
-int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i);
+void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i);
 int amdgpu_vcn_suspend(struct amdgpu_device *adev, int i);
 int amdgpu_vcn_resume(struct amdgpu_device *adev, int i);
 void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring);

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 1e89ba1..3c1c844 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -230,11 +230,11 @@ static int vcn_v1_0_sw_fini(struct amdgpu_ip_block *ip_block)
 
        jpeg_v1_0_sw_fini(ip_block);
 
-       r = amdgpu_vcn_sw_fini(adev, 0);
+       amdgpu_vcn_sw_fini(adev, 0);
 
        kfree(adev->vcn.ip_dump);
 
-       return r;
+       return 0;
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
index b115137..c4e2659 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
@@ -267,9 +267,9 @@ static int vcn_v2_0_sw_fini(struct amdgpu_ip_block *ip_block)
 
        amdgpu_vcn_sysfs_reset_mask_fini(adev);
 
-       r = amdgpu_vcn_sw_fini(adev, 0);
+       amdgpu_vcn_sw_fini(adev, 0);
 
-       return r;
+       return 0;
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 904b94b..0505f09 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -442,9 +442,7 @@ static int vcn_v2_5_sw_fini(struct amdgpu_ip_block *ip_block)
                r = amdgpu_vcn_suspend(adev, i);
                if (r)
                        return r;
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
+               amdgpu_vcn_sw_fini(adev, i);
        }
 
        return 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index f308513..77a8373 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -349,9 +349,7 @@ static int vcn_v3_0_sw_fini(struct amdgpu_ip_block *ip_block)
                if (r)
                        return r;
 
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
+               amdgpu_vcn_sw_fini(adev, i);
        }
 
        return 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index bc9dfe5..870c563 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -302,11 +302,8 @@ static int vcn_v4_0_sw_fini(struct amdgpu_ip_block *ip_block)
 
        amdgpu_vcn_sysfs_reset_mask_fini(adev);
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
-       }
+       for (i = 0; i < adev->vcn.num_vcn_inst; i++)
+               amdgpu_vcn_sw_fini(adev, i);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
index bae1ad4..5fbd755 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
@@ -283,11 +283,8 @@ static int vcn_v4_0_3_sw_fini(struct amdgpu_ip_block *ip_block)
 
        amdgpu_vcn_sysfs_reset_mask_fini(adev);
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
-       }
+       for (i = 0; i < adev->vcn.num_vcn_inst; i++)
+               amdgpu_vcn_sw_fini(adev, i);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
index 6dbf33b..732d4a7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
@@ -270,9 +270,7 @@ static int vcn_v4_0_5_sw_fini(struct amdgpu_ip_block *ip_block)
                if (r)
                        return r;
 
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
+               amdgpu_vcn_sw_fini(adev, i);
        }
 
        return 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
index 536f06b..680df5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
@@ -232,11 +232,8 @@ static int vcn_v5_0_0_sw_fini(struct amdgpu_ip_block *ip_block)
 
        amdgpu_vcn_sysfs_reset_mask_fini(adev);
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
-       }
+       for (i = 0; i < adev->vcn.num_vcn_inst; i++)
+               amdgpu_vcn_sw_fini(adev, i);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
index 4b01e35..09e2e28 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
@@ -245,14 +245,11 @@ static int vcn_v5_0_1_sw_fini(struct amdgpu_ip_block *ip_block)
                        return r;
        }
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-               r = amdgpu_vcn_sw_fini(adev, i);
-               if (r)
-                       return r;
-       }
-
        amdgpu_vcn_sysfs_reset_mask_fini(adev);
 
+       for (i = 0; i < adev->vcn.num_vcn_inst; i++)
+               amdgpu_vcn_sw_fini(adev, i);
+
        return 0;
 }