Commit 214c7642 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: define common jpeg_set_ras_funcs 



Make the code reusable.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2ddb629b

drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c

+17 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h

+1 −0
Original line number Diff line number Diff line
@@ -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__*/

drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c

+1 −12
Original line number Diff line number Diff line
@@ -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);

}