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

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



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

v2:
- Separate ras irq from vcn 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 8e1b45c5

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

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

}



int amdgpu_vcn_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->vcn.num_vcn_inst; i++) {

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

				continue;



			r = amdgpu_irq_get(adev, &adev->vcn.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_vcn_ras_sw_init(struct amdgpu_device *adev)

{

	int err;
@@ -1202,7 +1227,7 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev) 
	adev->vcn.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_vcn_ras_late_init;



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct amdgpu_vcn_inst { 
	struct amdgpu_ring	ring_enc[AMDGPU_VCN_MAX_ENC_RINGS];

	atomic_t		sched_score;

	struct amdgpu_irq_src	irq;

	struct amdgpu_irq_src	ras_poison_irq;

	struct amdgpu_vcn_reg	external;

	struct amdgpu_bo	*dpg_sram_bo;

	struct dpg_pause_state	pause_state;
@@ -400,6 +401,8 @@ 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);

int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,

			struct ras_common_if *ras_block);

int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);



#endif