Commit caa4dffa authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amdgpu: fix unexpected block id 



Aldebaran supports VCN and JPEG RAS, it reports unexpected
block id message during VCN and JPEG RAS initialization if VCN
and JPEG block id not defined.

Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent febc9c65

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

+4 −0
Original line number Diff line number Diff line
@@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) { 
		return TA_RAS_BLOCK__FUSE;

	case AMDGPU_RAS_BLOCK__MCA:

		return TA_RAS_BLOCK__MCA;

	case AMDGPU_RAS_BLOCK__VCN:

		return TA_RAS_BLOCK__VCN;

	case AMDGPU_RAS_BLOCK__JPEG:

		return TA_RAS_BLOCK__JPEG;

	default:

		WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block);

		return TA_RAS_BLOCK__UMC;

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

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ enum ta_ras_block { 
	TA_RAS_BLOCK__MP1,

	TA_RAS_BLOCK__FUSE,

	TA_RAS_BLOCK__MCA,

	TA_RAS_BLOCK__VCN,

	TA_RAS_BLOCK__JPEG,

	TA_NUM_BLOCK_MAX

};