From bf66a1778f30a0e7f06d1750ee7c06cad82d7aaa Mon Sep 17 00:00:00 2001 From: Harish Kasiviswanathan Date: Thu, 1 Oct 2015 17:19:56 -0400 Subject: [PATCH 1373/4131] drm/amdgpu: add members to struct amdgpu_cu_info For KFD topology these additional information is necessary. Change-Id: Ifd700b28cce7d38e41c1a168d64dfa2d992b150c Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu.h --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index b07c90e..5323609 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -938,6 +938,7 @@ struct amdgpu_gfx_config { }; struct amdgpu_cu_info { + uint32_t simd_per_cu; uint32_t max_waves_per_simd; uint32_t wave_front_size; uint32_t max_scratch_slots_per_cu; @@ -1270,6 +1271,7 @@ struct amdgpu_allowed_register_entry { bool grbm_indexed; }; + /* * ASIC specific functions. */ diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index b65b4e3..83266bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c @@ -5250,6 +5250,12 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; + cu_info->simd_per_cu = NUM_SIMD_PER_CU; + if (adev->asic_type == CHIP_KAVERI) { + cu_info->max_waves_per_simd = 10; + cu_info->max_scratch_slots_per_cu = 32; + cu_info->wave_front_size = 64; + } } const struct amdgpu_ip_block_version gfx_v7_0_ip_block = -- 2.7.4