Commit 0cf6faaf authored by Xiaomeng Hou's avatar Xiaomeng Hou Committed by Alex Deucher
Browse files

drm/amdgpu: correct the cu and rb info for yellow carp 



Skip disabled sa to correct the cu_info and active_rbs for yellow carp.

Signed-off-by: default avatarXiaomeng Hou <Xiaomeng.Hou@amd.com>
Suggested-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b3accd6f

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

+4 −2
Original line number Diff line number Diff line
@@ -4950,7 +4950,8 @@ static void gfx_v10_0_setup_rb(struct amdgpu_device *adev) 
	for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {

		for (j = 0; j < adev->gfx.config.max_sh_per_se; j++) {

			bitmap = i * adev->gfx.config.max_sh_per_se + j;

			if ((adev->asic_type == CHIP_SIENNA_CICHLID) &&

			if (((adev->asic_type == CHIP_SIENNA_CICHLID) ||

				(adev->asic_type == CHIP_YELLOW_CARP)) &&

			    ((gfx_v10_3_get_disabled_sa(adev) >> bitmap) & 1))

				continue;

			gfx_v10_0_select_se_sh(adev, i, j, 0xffffffff);
@@ -9370,7 +9371,8 @@ static int gfx_v10_0_get_cu_info(struct amdgpu_device *adev, 
	for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {

		for (j = 0; j < adev->gfx.config.max_sh_per_se; j++) {

			bitmap = i * adev->gfx.config.max_sh_per_se + j;

			if ((adev->asic_type == CHIP_SIENNA_CICHLID) &&

			if (((adev->asic_type == CHIP_SIENNA_CICHLID) ||

				(adev->asic_type == CHIP_YELLOW_CARP)) &&

			    ((gfx_v10_3_get_disabled_sa(adev) >> bitmap) & 1))

				continue;

			mask = 1;