drm/amdgpu: correct the cu and rb info for yellow carp
authorXiaomeng Hou <Xiaomeng.Hou@amd.com>
Tue, 6 Apr 2021 01:35:13 +0000 (09:35 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 4 Jun 2021 20:03:24 +0000 (16:03 -0400)
Skip disabled sa to correct the cu_info and active_rbs for yellow carp.

Signed-off-by: Xiaomeng Hou <Xiaomeng.Hou@amd.com>
Suggested-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

index 3606aaaba7bfb150763bf52c5bf3372bc8a1762e..2d56b60bc058bb5d062765ee34bf2e5670111017 100644 (file)
@@ -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;