Commit b6da3c58 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amdgpu: Add umc channel index mapping table for umc_v8_10 



Add umc channel index mapping table for umc_v8_10.

Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 469694e9

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

+4 −1
Original line number Diff line number Diff line
@@ -558,6 +558,9 @@ static void gmc_v11_0_set_umc_funcs(struct amdgpu_device *adev) 
		adev->umc.node_inst_num = adev->gmc.num_umc;

		adev->umc.max_ras_err_cnt_per_query = UMC_V8_10_TOTAL_CHANNEL_NUM(adev);

		adev->umc.channel_offs = UMC_V8_10_PER_CHANNEL_OFFSET;

		if (adev->umc.node_inst_num == 4)

			adev->umc.channel_idx_tbl = &umc_v8_10_channel_idx_tbl_ext0[0][0][0];

		else

			adev->umc.channel_idx_tbl = &umc_v8_10_channel_idx_tbl[0][0][0];

		adev->umc.ras = &umc_v8_10_ras;

		break;

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

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,16 @@ const struct channelnum_map_colbit umc_v8_10_channelnum_map_colbit_table[] = { 
	{6,  11},

};



const uint32_t

	umc_v8_10_channel_idx_tbl_ext0[]

				[UMC_V8_10_UMC_INSTANCE_NUM]

				[UMC_V8_10_CHANNEL_INSTANCE_NUM] = {

	   {{1,   5}, {7,  3}},

	   {{14, 15}, {13, 12}},

	   {{10, 11}, {9,  8}},

	   {{6,   2}, {0,  4}}

	};



const uint32_t

	umc_v8_10_channel_idx_tbl[]

				[UMC_V8_10_UMC_INSTANCE_NUM]

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

+4 −0
Original line number Diff line number Diff line
@@ -66,5 +66,9 @@ extern const uint32_t 
				[UMC_V8_10_UMC_INSTANCE_NUM]

				[UMC_V8_10_CHANNEL_INSTANCE_NUM];



extern const uint32_t

	umc_v8_10_channel_idx_tbl_ext0[]

				[UMC_V8_10_UMC_INSTANCE_NUM]

				[UMC_V8_10_CHANNEL_INSTANCE_NUM];

#endif