Commit 2ddb629b authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: define common vcn_set_ras_funcs 



So the code can be reused.

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 07615da1

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

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

}

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

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

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

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

}