drm/amd/amdgpu: Prepare implementation to support reporting of CU usage
Subsystems (2)
PATCH 1/3 drm/amd/amdgpu: Prepare implementation to support reporting of CU usage
[Why]
Allow user to know number of compute units (CU) that are in use at any given moment.
[How]
Read registers of SQ that give number of waves that are in flight of various queues. Use this information to determine number of CU's in use.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 ++++++-------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6 -8
@@ -49,6 +49,7 @@#include "amdgpu_ras.h" #include "gfx_v9_4.h" +#include "gfx_v9_0.h" #include "asic_reg/pwr/pwr_10_0_offset.h" #include "asic_reg/pwr/pwr_10_0_sh_mask.h"
@@ -785,10 +786,6 @@ static void gfx_v9_0_set_ring_funcs(struct amdgpu_device *adev);static void gfx_v9_0_set_irq_funcs (struct amdgpu_device *adev);static void gfx_v9_0_set_gds_init (struct amdgpu_device *adev);static void gfx_v9_0_set_rlc_funcs (struct amdgpu_device *adev); -static int gfx_v9_0_get_cu_info (struct amdgpu_device *adev, -struct amdgpu_cu_info *cu_info); -static uint64_t gfx_v9_0_get_gpu_clock_counter (struct amdgpu_device *adev); -static void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 instance);static void gfx_v9_0_ring_emit_de_meta (struct amdgpu_ring *ring);static u64 gfx_v9_0_ring_get_rptr_compute (struct amdgpu_ring *ring); static int gfx_v9_0_query_ras_error_count(struct amdgpu_device *adev,
@@ -2402,7 +2399,8 @@ static void gfx_v9_0_tiling_mode_table_init(struct amdgpu_device *adev)/* TODO */ } -static void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 instance) +void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num, +u32 instance) {u32 data;
@@ -4117,7 +4115,7 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)return ~0 ; } -static uint64_t gfx_v9_0_get_gpu_clock_counter (struct amdgpu_device *adev) +uint64_t gfx_v9_0_get_gpu_clock_counter (struct amdgpu_device *adev) {uint64_t clock;
@@ -6928,8 +6926,8 @@ static u32 gfx_v9_0_get_cu_active_bitmap(struct amdgpu_device *adev)return (~data) & mask; } -static int gfx_v9_0_get_cu_info (struct amdgpu_device *adev, -struct amdgpu_cu_info *cu_info) +int gfx_v9_0_get_cu_info (struct amdgpu_device *adev, +struct amdgpu_cu_info *cu_info) {int i, j, k, counter, active_cu_number =0 ;u32 mask, bitmap, ao_bitmap, ao_cu_mask =0 ;
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h +1 -2
@@ -26,9 +26,8 @@extern const struct amdgpu_ip_block_version gfx_v9_0_ip_block; -void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num); -uint64_t gfx_v9_0_get_gpu_clock_counter (struct amdgpu_device *adev);int gfx_v9_0_get_cu_info (struct amdgpu_device *adev,struct amdgpu_cu_info *cu_info); +void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 instance);#endif
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Ramesh Errabolu
Sent: Thursday, September 17, 2020 1:10 PM
To: [email protected]
Cc: Errabolu, Ramesh <[email protected]>
Subject: [PATCH 1/3] drm/amd/amdgpu: Prepare implementation to support reporting of CU usage
[Why]
Allow user to know number of compute units (CU) that are in use at any given moment.
[How]
Read registers of SQ that give number of waves that are in flight of various queues. Use this information to determine number of CU's in use.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 ++++++-------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -3
@@ -49,6 +49,7 @@#include "amdgpu_ras.h" #include "gfx_v9_4.h" +#include "gfx_v9_0.h" #include "asic_reg/pwr/pwr_10_0_offset.h" #include "asic_reg/pwr/pwr_10_0_sh_mask.h"
@@ -785,10 +786,6 @@ static void gfx_v9_0_set_ring_funcs(struct amdgpu_device *adev); static void gfx_v9_0_set_irq_funcs(struct amdgpu_device *adev); static void gfx_v9_0_set_gds_init(struct amdgpu_device *adev); static void gfx_v9_0_set_rlc_funcs(struct amdgpu_device *adev); -static int gfx_v9_0_get_cu_info(struct amdgpu_device *adev, - struct amdgpu_cu_info *cu_info); -static uint64_t gfx_v9_0_get_gpu_clock_counter(struct amdgpu_device *adev); -static void gfx_v9_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, u32 sh_num, u32 instance); static void gfx_v9_0_ring_emit_de_meta(struct amdgpu_ring *ring); static u64 gfx_v9_0_ring_get_rptr_compute(struct amdgpu_ring *ring); static int gfx_v9_0_query_ras_error_count(struct amdgpu_device *adev, @@ -2402,7 +2399,8 @@ static void gfx_v9_0_tiling_mode_table_init(struct amdgpu_device *adev)/* TODO */ } -static void gfx_v9_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, u32 sh_num, u32 instance) +void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num, +u32 instance) {
u32 data;
@@ -4117,7 +4115,7 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)
return ~0;
}
-static uint64_t gfx_v9_0_get_gpu_clock_counter(struct amdgpu_device *adev) +uint64_t gfx_v9_0_get_gpu_clock_counter(struct amdgpu_device *adev)
{
uint64_t clock;
@@ -6928,8 +6926,8 @@ static u32 gfx_v9_0_get_cu_active_bitmap(struct amdgpu_device *adev)
return (~data) & mask;
}
-static int gfx_v9_0_get_cu_info(struct amdgpu_device *adev,
- struct amdgpu_cu_info *cu_info)
+int gfx_v9_0_get_cu_info(struct amdgpu_device *adev,
+ struct amdgpu_cu_info *cu_info)
{
int i, j, k, counter, active_cu_number = 0;
u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0; diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h
index fa5a3fbaf6ab..a3d73667e60a 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h +2 -3
@@ -26,9 +26,8 @@extern const struct amdgpu_ip_block_version gfx_v9_0_ip_block; -void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 sh_num); -uint64_t gfx_v9_0_get_gpu_clock_counter (struct amdgpu_device *adev);int gfx_v9_0_get_cu_info (struct amdgpu_device *adev,struct amdgpu_cu_info *cu_info); +void gfx_v9_0_select_se_sh (struct amdgpu_device *adev,u32 se_num,u32 +sh_num,u32 instance);#endif --
2.27.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Charish.kasiviswanathan%40amd.com%7C3bfdcc273e83409ace5e08d85b2c9f3a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637359595074288470&sdata=%2BZxEsMUzsXR1ZSf%2FHOsIcB2tH%2Fk%2BqDog7dzdkyGM%2FQY%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx