]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu: drop some kernel messages in VCN code
authorDavid (Ming Qiang) Wu <David.Wu3@amd.com>
Thu, 30 May 2024 14:50:59 +0000 (10:50 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jun 2024 20:16:51 +0000 (16:16 -0400)
Similar to commit 813e7d4cd05e where some kernel log
messages are dropped. With this commit, more log
messages in older version of VCN/JPEG code are dropped.

Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
14 files changed:
drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c

index 77595e9622da34204d3be939c2c1c74cfdf9bdf3..71f43a5c7f7217052e17b7322f9e2651baaefc0e 100644 (file)
@@ -581,7 +581,6 @@ static const struct amdgpu_ring_funcs jpeg_v1_0_decode_ring_vm_funcs = {
 static void jpeg_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->jpeg.inst->ring_dec->funcs = &jpeg_v1_0_decode_ring_vm_funcs;
-       DRM_INFO("JPEG decode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs jpeg_v1_0_irq_funcs = {
index ef3e42f6b8411c91a31113e1943038d6ee24e910..99adf3625657e9b7362708e56c27fc5d57d5a07d 100644 (file)
@@ -131,16 +131,11 @@ static int jpeg_v2_0_hw_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
-       int r;
 
        adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
                (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
 
-       r = amdgpu_ring_test_helper(ring);
-       if (!r)
-               DRM_INFO("JPEG decode initialized successfully.\n");
-
-       return r;
+       return amdgpu_ring_test_helper(ring);
 }
 
 /**
@@ -795,7 +790,6 @@ static const struct amdgpu_ring_funcs jpeg_v2_0_dec_ring_vm_funcs = {
 static void jpeg_v2_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->jpeg.inst->ring_dec->funcs = &jpeg_v2_0_dec_ring_vm_funcs;
-       DRM_INFO("JPEG decode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs jpeg_v2_0_irq_funcs = {
index afeaf3c64e27803591c83265b3504b26e46ea171..d8ef95c847c2a7f2e85e3b6f247db8c41fc4d667 100644 (file)
@@ -196,8 +196,6 @@ static int jpeg_v2_5_hw_init(void *handle)
                        return r;
        }
 
-       DRM_INFO("JPEG decode initialized successfully.\n");
-
        return 0;
 }
 
@@ -728,7 +726,6 @@ static void jpeg_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev)
                else  /* CHIP_ALDEBARAN */
                        adev->jpeg.inst[i].ring_dec->funcs = &jpeg_v2_6_dec_ring_vm_funcs;
                adev->jpeg.inst[i].ring_dec->me = i;
-               DRM_INFO("JPEG(%d) JPEG decode is enabled in VM mode\n", i);
        }
 }
 
index 1c7cf4800bf7bb9570a0198f9f3743f2be26c8a2..31cfa3ce6528d8fe7bb53a2caf2e09731c77a5ca 100644 (file)
@@ -146,18 +146,11 @@ static int jpeg_v3_0_hw_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
-       int r;
 
        adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
                (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
 
-       r = amdgpu_ring_test_helper(ring);
-       if (r)
-               return r;
-
-       DRM_INFO("JPEG decode initialized successfully.\n");
-
-       return 0;
+       return amdgpu_ring_test_helper(ring);
 }
 
 /**
@@ -593,7 +586,6 @@ static const struct amdgpu_ring_funcs jpeg_v3_0_dec_ring_vm_funcs = {
 static void jpeg_v3_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->jpeg.inst->ring_dec->funcs = &jpeg_v3_0_dec_ring_vm_funcs;
-       DRM_INFO("JPEG decode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs jpeg_v3_0_irq_funcs = {
index 237fe5df5a8fb567521b5964c5c5bdfdb1cadad4..3dac8f259d7fb55e467b64985e27a92800fe6c14 100644 (file)
@@ -181,8 +181,6 @@ static int jpeg_v4_0_hw_init(void *handle)
                        return r;
        }
 
-       DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
-
        return 0;
 }
 
@@ -755,7 +753,6 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_dec_ring_vm_funcs = {
 static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->jpeg.inst->ring_dec->funcs = &jpeg_v4_0_dec_ring_vm_funcs;
-       DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs jpeg_v4_0_irq_funcs = {
index d66af11aa66c7064207967b165434a3664efffe9..04d8966423decf1879fd46e950a4724a09cfc6be 100644 (file)
@@ -341,7 +341,6 @@ static int jpeg_v4_0_3_hw_init(void *handle)
                        }
                }
        }
-       DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
 
        return 0;
 }
@@ -1100,7 +1099,6 @@ static void jpeg_v4_0_3_set_dec_ring_funcs(struct amdgpu_device *adev)
                adev->jpeg.inst[i].aid_id =
                        jpeg_inst / adev->jpeg.num_inst_per_aid;
        }
-       DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs jpeg_v4_0_3_irq_funcs = {
index 4c8f9772437b52a034dcc2d6b622078afb622c85..f96ac6bce526d3490f6451c495152576b7180237 100644 (file)
@@ -191,7 +191,6 @@ static int jpeg_v4_0_5_hw_init(void *handle)
 
        // TODO: Enable ring test with DPG support
        if (adev->pg_flags & AMD_PG_SUPPORT_JPEG_DPG) {
-               DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully under DPG Mode");
                return 0;
        }
 
@@ -205,9 +204,6 @@ static int jpeg_v4_0_5_hw_init(void *handle)
                        return r;
        }
 
-       if (!r)
-               DRM_INFO("JPEG decode initialized successfully under SPG Mode\n");
-
        return 0;
 }
 
@@ -805,7 +801,6 @@ static void jpeg_v4_0_5_set_dec_ring_funcs(struct amdgpu_device *adev)
 
                adev->jpeg.inst[i].ring_dec->funcs = &jpeg_v4_0_5_dec_ring_vm_funcs;
                adev->jpeg.inst[i].ring_dec->me = i;
-               DRM_DEV_INFO(adev->dev, "JPEG%d decode is enabled in VM mode\n", i);
        }
 }
 
index cb253bd3a2a2da5fae07d04ed1579688f435c5c0..a280b9fecb7732055c84cd4450bc65738626c724 100644 (file)
@@ -202,24 +202,17 @@ static int vcn_v1_0_hw_init(void *handle)
 
        r = amdgpu_ring_test_helper(ring);
        if (r)
-               goto done;
+               return r;
 
        for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
                ring = &adev->vcn.inst->ring_enc[i];
                r = amdgpu_ring_test_helper(ring);
                if (r)
-                       goto done;
+                       return r;
        }
 
        ring = adev->jpeg.inst->ring_dec;
        r = amdgpu_ring_test_helper(ring);
-       if (r)
-               goto done;
-
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
 
        return r;
 }
@@ -2043,7 +2036,6 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {
 static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->vcn.inst->ring_dec.funcs = &vcn_v1_0_dec_ring_vm_funcs;
-       DRM_INFO("VCN decode is enabled in VM mode\n");
 }
 
 static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev)
@@ -2052,8 +2044,6 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->vcn.num_enc_rings; ++i)
                adev->vcn.inst->ring_enc[i].funcs = &vcn_v1_0_enc_ring_vm_funcs;
-
-       DRM_INFO("VCN encode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs vcn_v1_0_irq_funcs = {
index f18fd61c435e6a14059d243f100f9629eac89966..d3d096909a7f460fa330131702049cd1bcda9145 100644 (file)
@@ -237,7 +237,7 @@ static int vcn_v2_0_hw_init(void *handle)
 
        r = amdgpu_ring_test_helper(ring);
        if (r)
-               goto done;
+               return r;
 
        //Disable vcn decode for sriov
        if (amdgpu_sriov_vf(adev))
@@ -247,15 +247,10 @@ static int vcn_v2_0_hw_init(void *handle)
                ring = &adev->vcn.inst->ring_enc[i];
                r = amdgpu_ring_test_helper(ring);
                if (r)
-                       goto done;
+                       return r;
        }
 
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
-       return r;
+       return 0;
 }
 
 /**
@@ -2074,7 +2069,6 @@ static const struct amdgpu_ring_funcs vcn_v2_0_enc_ring_vm_funcs = {
 static void vcn_v2_0_set_dec_ring_funcs(struct amdgpu_device *adev)
 {
        adev->vcn.inst->ring_dec.funcs = &vcn_v2_0_dec_ring_vm_funcs;
-       DRM_INFO("VCN decode is enabled in VM mode\n");
 }
 
 static void vcn_v2_0_set_enc_ring_funcs(struct amdgpu_device *adev)
@@ -2083,8 +2077,6 @@ static void vcn_v2_0_set_enc_ring_funcs(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->vcn.num_enc_rings; ++i)
                adev->vcn.inst->ring_enc[i].funcs = &vcn_v2_0_enc_ring_vm_funcs;
-
-       DRM_INFO("VCN encode is enabled in VM mode\n");
 }
 
 static const struct amdgpu_irq_src_funcs vcn_v2_0_irq_funcs = {
index baec14bde2a20049ec6888c75bd5786b42db248b..96f60c30316100fafcd7712c4de05df4081506aa 100644 (file)
@@ -314,22 +314,17 @@ static int vcn_v2_5_hw_init(void *handle)
 
                        r = amdgpu_ring_test_helper(ring);
                        if (r)
-                               goto done;
+                               return r;
 
                        for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
                                ring = &adev->vcn.inst[j].ring_enc[i];
                                r = amdgpu_ring_test_helper(ring);
                                if (r)
-                                       goto done;
+                                       return r;
                        }
                }
        }
 
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
        return r;
 }
 
@@ -1710,7 +1705,6 @@ static void vcn_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev)
                        continue;
                adev->vcn.inst[i].ring_dec.funcs = &vcn_v2_5_dec_ring_vm_funcs;
                adev->vcn.inst[i].ring_dec.me = i;
-               DRM_INFO("VCN(%d) decode is enabled in VM mode\n", i);
        }
 }
 
@@ -1725,7 +1719,6 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev)
                        adev->vcn.inst[j].ring_enc[i].funcs = &vcn_v2_5_enc_ring_vm_funcs;
                        adev->vcn.inst[j].ring_enc[i].me = j;
                }
-               DRM_INFO("VCN(%d) encode is enabled in VM mode\n", j);
        }
 }
 
index 6b31cf4b8aac74bd1020e740112d562cf1326c8b..24f947751c463b41a0e2afc10b92d0fb5af57839 100644 (file)
@@ -303,7 +303,7 @@ static int vcn_v3_0_hw_init(void *handle)
        if (amdgpu_sriov_vf(adev)) {
                r = vcn_v3_0_start_sriov(adev);
                if (r)
-                       goto done;
+                       return r;
 
                /* initialize VCN dec and enc ring buffers */
                for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
@@ -348,24 +348,18 @@ static int vcn_v3_0_hw_init(void *handle)
 
                        r = amdgpu_ring_test_helper(ring);
                        if (r)
-                               goto done;
+                               return r;
 
                        for (j = 0; j < adev->vcn.num_enc_rings; ++j) {
                                ring = &adev->vcn.inst[i].ring_enc[j];
                                r = amdgpu_ring_test_helper(ring);
                                if (r)
-                                       goto done;
+                                       return r;
                        }
                }
        }
 
        return 0;
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
-       return r;
 }
 
 /**
@@ -2041,8 +2035,6 @@ static void vcn_v3_0_set_dec_ring_funcs(struct amdgpu_device *adev)
                else
                        adev->vcn.inst[i].ring_dec.funcs = &vcn_v3_0_dec_sw_ring_vm_funcs;
                adev->vcn.inst[i].ring_dec.me = i;
-               DRM_INFO("VCN(%d) decode%s is enabled in VM mode\n", i,
-                         DEC_SW_RING_ENABLED?"(Software Ring)":"");
        }
 }
 
@@ -2058,8 +2050,6 @@ static void vcn_v3_0_set_enc_ring_funcs(struct amdgpu_device *adev)
                        adev->vcn.inst[i].ring_enc[j].funcs = &vcn_v3_0_enc_ring_vm_funcs;
                        adev->vcn.inst[i].ring_enc[j].me = i;
                }
-               if (adev->vcn.num_enc_rings > 0)
-                       DRM_INFO("VCN(%d) encode is enabled in VM mode\n", i);
        }
 }
 
index ac1b8ead03b3bb72250f8b1518300294e0a77373..f6d96a44d75ff3b62ed77917674ebcc9ca2c7819 100644 (file)
@@ -258,7 +258,7 @@ static int vcn_v4_0_hw_init(void *handle)
        if (amdgpu_sriov_vf(adev)) {
                r = vcn_v4_0_start_sriov(adev);
                if (r)
-                       goto done;
+                       return r;
 
                for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
                        if (adev->vcn.harvest_config & (1 << i))
@@ -269,7 +269,6 @@ static int vcn_v4_0_hw_init(void *handle)
                        ring->wptr_old = 0;
                        vcn_v4_0_unified_ring_set_wptr(ring);
                        ring->sched.ready = true;
-
                }
        } else {
                for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
@@ -283,18 +282,11 @@ static int vcn_v4_0_hw_init(void *handle)
 
                        r = amdgpu_ring_test_helper(ring);
                        if (r)
-                               goto done;
-
+                               return r;
                }
        }
 
        return 0;
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
-       return r;
 }
 
 /**
@@ -1900,8 +1892,6 @@ static void vcn_v4_0_set_unified_ring_funcs(struct amdgpu_device *adev)
                adev->vcn.inst[i].ring_enc[0].funcs =
                       (const struct amdgpu_ring_funcs *)&vcn_v4_0_unified_ring_vm_funcs;
                adev->vcn.inst[i].ring_enc[0].me = i;
-
-               DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
        }
 }
 
index 2279d8fce03d48913d4f84e5d5fb2d0b83bb7e7d..f53054e39ebb473462d610ac419e3cdf1b300394 100644 (file)
@@ -210,7 +210,7 @@ static int vcn_v4_0_3_hw_init(void *handle)
        if (amdgpu_sriov_vf(adev)) {
                r = vcn_v4_0_3_start_sriov(adev);
                if (r)
-                       goto done;
+                       return r;
 
                for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
                        ring = &adev->vcn.inst[i].ring_enc[0];
@@ -246,15 +246,10 @@ static int vcn_v4_0_3_hw_init(void *handle)
 
                        r = amdgpu_ring_test_helper(ring);
                        if (r)
-                               goto done;
+                               return r;
                }
        }
 
-done:
-       if (!r)
-               DRM_DEV_INFO(adev->dev, "VCN decode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
        return r;
 }
 
@@ -1450,7 +1445,6 @@ static void vcn_v4_0_3_set_unified_ring_funcs(struct amdgpu_device *adev)
                adev->vcn.inst[i].aid_id =
                        vcn_inst / adev->vcn.num_inst_per_aid;
        }
-       DRM_DEV_INFO(adev->dev, "VCN decode is enabled in VM mode\n");
 }
 
 /**
index 81fb99729f37d917510d8e50655ae81167aa0b32..f45495de6875d58046837a6de82624c3674f33b1 100644 (file)
@@ -234,16 +234,10 @@ static int vcn_v4_0_5_hw_init(void *handle)
 
                r = amdgpu_ring_test_helper(ring);
                if (r)
-                       goto done;
+                       return r;
        }
 
        return 0;
-done:
-       if (!r)
-               DRM_INFO("VCN decode and encode initialized successfully(under %s).\n",
-                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
-
-       return r;
 }
 
 /**
@@ -1558,8 +1552,6 @@ static void vcn_v4_0_5_set_unified_ring_funcs(struct amdgpu_device *adev)
 
                adev->vcn.inst[i].ring_enc[0].funcs = &vcn_v4_0_5_unified_ring_vm_funcs;
                adev->vcn.inst[i].ring_enc[0].me = i;
-
-               DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
        }
 }