diff options
author | Flora Cui <Flora.Cui@amd.com> | 2017-06-19 23:08:35 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-06-29 12:43:49 -0400 |
commit | dbfe85ea496728ccf7731601084853f760be77d7 (patch) | |
tree | 7029e2119b04924de3deb34f90dbb8e75f0ebfd8 /drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | |
parent | 552c8f76afe7d24c1c1415ec951dea56d553d59c (diff) |
drm/amdgpu: Fix the exported always on CU bitmap
Newer asics with 4 SEs are not able to fit the entire bitmask in the
original field, use an array instead.
v2: keep cu_ao_mask for backward compatibility.
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 209bf0188e06..2e6f203fab9e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | |||
@@ -4459,7 +4459,9 @@ static int gfx_v9_0_get_cu_info(struct amdgpu_device *adev, | |||
4459 | mask <<= 1; | 4459 | mask <<= 1; |
4460 | } | 4460 | } |
4461 | active_cu_number += counter; | 4461 | active_cu_number += counter; |
4462 | ao_cu_mask |= (ao_bitmap << (i * 16 + j * 8)); | 4462 | if (i < 2 && j < 2) |
4463 | ao_cu_mask |= (ao_bitmap << (i * 16 + j * 8)); | ||
4464 | cu_info->ao_cu_bitmap[i][j] = ao_bitmap; | ||
4463 | } | 4465 | } |
4464 | } | 4466 | } |
4465 | gfx_v9_0_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff); | 4467 | gfx_v9_0_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff); |