drm/amdgpu: define common jpeg_set_ras_funcs

Make the code reusable.

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_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
index 518eb0e40d32f941fa125c392193c3fef42f2406..8f472517d1811c161746f6f403995860e150ebda 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
@@ -234,3 +234,20 @@ int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev,
 
        return 0;
 }
+
+void jpeg_set_ras_funcs(struct amdgpu_device *adev)
+{
+       if (!adev->jpeg.ras)
+               return;
+
+       amdgpu_ras_register_ras_block(adev, &adev->jpeg.ras->ras_block);
+
+       strcpy(adev->jpeg.ras->ras_block.ras_comm.name, "jpeg");
+       adev->jpeg.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__JPEG;
+       adev->jpeg.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON;
+       adev->jpeg.ras_if = &adev->jpeg.ras->ras_block.ras_comm;
+
+       /* If don't define special ras_late_init function, use default ras_late_init */
+       if (!adev->jpeg.ras->ras_block.ras_late_init)
+               adev->jpeg.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
index 635dca59a70adfa4d462e6d2282ad830677593c7..e8ca3e32ad52d996476cbf3675b5d2b032f16733 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
@@ -72,5 +72,6 @@ int amdgpu_jpeg_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout);
 int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev,
                                struct amdgpu_irq_src *source,
                                struct amdgpu_iv_entry *entry);
+void jpeg_set_ras_funcs(struct amdgpu_device *adev);
 
 #endif /*__AMDGPU_JPEG_H__*/

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
index f87d0f6ffc93f372fc1216b8bea4666976cc299b..f2b743a93915adb49bdba21c9e6afc84ff6d30bf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
@@ -807,16 +807,5 @@ static void jpeg_v2_5_set_ras_funcs(struct amdgpu_device *adev)
                break;
        }
 
-       if (adev->jpeg.ras) {
-               amdgpu_ras_register_ras_block(adev, &adev->jpeg.ras->ras_block);
-
-               strcpy(adev->jpeg.ras->ras_block.ras_comm.name, "jpeg");
-               adev->jpeg.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__JPEG;
-               adev->jpeg.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON;
-               adev->jpeg.ras_if = &adev->jpeg.ras->ras_block.ras_comm;
-
-               /* If don't define special ras_late_init function, use default ras_late_init */
-               if (!adev->jpeg.ras->ras_block.ras_late_init)
-                       adev->jpeg.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;
-       }
+       jpeg_set_ras_funcs(adev);
 }