Commit ce784421 authored by Horatio Zhang's avatar Horatio Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: separate ras irq from jpeg instance irq for UVD_POISON 



Separate jpegbRAS poison consumption handling from the instance irq, and
register dedicated ras_poison_irq src and funcs for UVD_POISON.

v2:
- Separate ras irq from jpeg instance irq
- Improve the subject and code comments

v3:
- Split the patch into three parts
- Improve the code comments

Suggested-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarHoratio Zhang <Hongkun.Zhang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 020c76d9

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

+26 −1
Original line number Diff line number Diff line
@@ -241,6 +241,31 @@ int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev, 
	return 0;

}



int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r, i;



	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {

			if (adev->jpeg.harvest_config & (1 << i))

				continue;



			r = amdgpu_irq_get(adev, &adev->jpeg.inst[i].ras_poison_irq, 0);

			if (r)

				goto late_fini;

		}

	}

	return 0;



late_fini:

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}



int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev)

{

	int err;
@@ -262,7 +287,7 @@ int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev) 
	adev->jpeg.ras_if = &ras->ras_block.ras_comm;



	if (!ras->ras_block.ras_late_init)

		ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;

		ras->ras_block.ras_late_init = amdgpu_jpeg_ras_late_init;



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct amdgpu_jpeg_reg{ 
struct amdgpu_jpeg_inst {

	struct amdgpu_ring ring_dec;

	struct amdgpu_irq_src irq;

	struct amdgpu_irq_src ras_poison_irq;

	struct amdgpu_jpeg_reg external;

};
@@ -72,6 +73,8 @@ 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);

int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev,

				struct ras_common_if *ras_block);

int amdgpu_jpeg_ras_sw_init(struct amdgpu_device *adev);



#endif /*__AMDGPU_JPEG_H__*/