drm/amdgpu: define common vcn_set_ras_funcs

So the code can be reused.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.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 0b52af415b282f809898c7a21a4414f86bd3e772..c448c1bdf84d917bced097a417561e860bcb6967 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -1248,3 +1248,20 @@ int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev,
 
        return 0;
 }
+
+void amdgpu_vcn_set_ras_funcs(struct amdgpu_device *adev)
+{
+       if (!adev->vcn.ras)
+               return;
+
+       amdgpu_ras_register_ras_block(adev, &adev->vcn.ras->ras_block);
+
+       strcpy(adev->vcn.ras->ras_block.ras_comm.name, "vcn");
+       adev->vcn.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__VCN;
+       adev->vcn.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON;
+       adev->vcn.ras_if = &adev->vcn.ras->ras_block.ras_comm;
+
+       /* If don't define special ras_late_init function, use default ras_late_init */
+       if (!adev->vcn.ras->ras_block.ras_late_init)
+               adev->vcn.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index 253ea6b159df97de3890f5b93cf37742de4a8f33..dbb8d68a30c61040c9115d7d0ce2b43018f6ec4f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -399,5 +399,6 @@ void amdgpu_debugfs_vcn_fwlog_init(struct amdgpu_device *adev,
 int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev,
                        struct amdgpu_irq_src *source,
                        struct amdgpu_iv_entry *entry);
+void amdgpu_vcn_set_ras_funcs(struct amdgpu_device *adev);
 
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 8a7006d62a87ac18df8d19c03db3d295ac9bdc82..ce8374ee824dd19c19b7700ab61ba0994d4ab742 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -2002,16 +2002,5 @@ static void vcn_v2_5_set_ras_funcs(struct amdgpu_device *adev)
                break;
        }
 
-       if (adev->vcn.ras) {
-               amdgpu_ras_register_ras_block(adev, &adev->vcn.ras->ras_block);
-
-               strcpy(adev->vcn.ras->ras_block.ras_comm.name, "vcn");
-               adev->vcn.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__VCN;
-               adev->vcn.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON;
-               adev->vcn.ras_if = &adev->vcn.ras->ras_block.ras_comm;
-
-               /* If don't define special ras_late_init function, use default ras_late_init */
-               if (!adev->vcn.ras->ras_block.ras_late_init)
-                       adev->vcn.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;
-       }
+       amdgpu_vcn_set_ras_funcs(adev);
 }