History

drm/radeon: add query for number of active CUs

Query to find out how many compute units on a GPU. Useful for OpenCL usermode drivers.

Alex Deucher committed 12 years ago

Commit 65fcf661 parent 478b6e710 files · +76 −4Browse files

Unified · Split

10 files
  1. drivers/gpu/drm/radeon/cik.c +11 −1
  2. drivers/gpu/drm/radeon/evergreen.c +12 −0
  3. drivers/gpu/drm/radeon/ni.c +12 −0
  4. drivers/gpu/drm/radeon/r600.c +3 −0
  5. drivers/gpu/drm/radeon/radeon.h +6 −0
  6. drivers/gpu/drm/radeon/radeon_drv.c +2 −1
  7. drivers/gpu/drm/radeon/radeon_kms.c +16 −0
  8. drivers/gpu/drm/radeon/rv770.c +3 −0
  9. drivers/gpu/drm/radeon/si.c +10 −1
  10. include/uapi/drm/radeon_drm.h +1 −1
drivers/gpu/drm/radeon/cik.c+11−1
@@ -80,6 +80,7 @@ extern int sumo_rlc_init(struct radeon_device *rdev); · 79 unmodified lines
8080 extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);
8181 extern void si_rlc_reset(struct radeon_device *rdev);
8282 extern void si_init_uvd_internal_cg(struct radeon_device *rdev);
83+static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh);
8384 extern int cik_sdma_resume(struct radeon_device *rdev);
8485 extern void cik_sdma_enable(struct radeon_device *rdev, bool enable);
8586 extern void cik_sdma_fini(struct radeon_device *rdev);
@@ -3257,7 +3258,7 @@ static void cik_gpu_init(struct radeon_device *rdev) · 3171 unmodified lines
32573258 u32 mc_shared_chmap, mc_arb_ramcfg;
32583259 u32 hdp_host_path_cntl;
32593260 u32 tmp;
3260− int i, j;
3261+ int i, j, k;
32613262
32623263 switch (rdev->family) {
32633264 case CHIP_BONAIRE:
@@ -3446,6 +3447,15 @@ static void cik_gpu_init(struct radeon_device *rdev) · 182 unmodified lines
34463447 rdev->config.cik.max_sh_per_se,
34473448 rdev->config.cik.max_backends_per_se);
34483449
3450+ for (i = 0; i < rdev->config.cik.max_shader_engines; i++) {
3451+ for (j = 0; j < rdev->config.cik.max_sh_per_se; j++) {
3452+ for (k = 0; k < rdev->config.cik.max_cu_per_sh; k++) {
3453+ rdev->config.cik.active_cus +=
3454+ hweight32(cik_get_cu_active_bitmap(rdev, i, j));
3455+ }
3456+ }
3457+ }
3458+
34493459 /* set HW defaults for 3D engine */
34503460 WREG32(CP_MEQ_THRESHOLDS, MEQ1_START(0x30) | MEQ2_START(0x60));
34513461
drivers/gpu/drm/radeon/evergreen.c+12−0
@@ -3337,6 +3337,18 @@ static void evergreen_gpu_init(struct radeon_device *rdev) · 3336 unmodified lines
33373337 disabled_rb_mask &= ~(1 << i);
33383338 }
33393339
3340+ for (i = 0; i < rdev->config.evergreen.num_ses; i++) {
3341+ u32 simd_disable_bitmap;
3342+
3343+ WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
3344+ WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
3345+ simd_disable_bitmap = (RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffff0000) >> 16;
3346+ simd_disable_bitmap |= 0xffffffff << rdev->config.evergreen.max_simds;
3347+ tmp <<= 16;
3348+ tmp |= simd_disable_bitmap;
3349+ }
3350+ rdev->config.evergreen.active_simds = hweight32(~tmp);
3351+
33403352 WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
33413353 WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
33423354
drivers/gpu/drm/radeon/ni.c+12−0
@@ -1057,6 +1057,18 @@ static void cayman_gpu_init(struct radeon_device *rdev) · 1056 unmodified lines
10571057 disabled_rb_mask &= ~(1 << i);
10581058 }
10591059
1060+ for (i = 0; i < rdev->config.cayman.max_shader_engines; i++) {
1061+ u32 simd_disable_bitmap;
1062+
1063+ WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
1064+ WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
1065+ simd_disable_bitmap = (RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffff0000) >> 16;
1066+ simd_disable_bitmap |= 0xffffffff << rdev->config.cayman.max_simds_per_se;
1067+ tmp <<= 16;
1068+ tmp |= simd_disable_bitmap;
1069+ }
1070+ rdev->config.cayman.active_simds = hweight32(~tmp);
1071+
10601072 WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
10611073 WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
10621074
drivers/gpu/drm/radeon/r600.c+3−0
@@ -1958,6 +1958,9 @@ static void r600_gpu_init(struct radeon_device *rdev) · 1957 unmodified lines
19581958 if (tmp < rdev->config.r600.max_simds) {
19591959 rdev->config.r600.max_simds = tmp;
19601960 }
1961+ tmp = rdev->config.r600.max_simds -
1962+ r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
1963+ rdev->config.r600.active_simds = tmp;
19611964
19621965 disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R6XX_MAX_BACKENDS_MASK;
19631966 tmp = (tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
drivers/gpu/drm/radeon/radeon.h+6−0
@@ -1932,6 +1932,7 @@ struct r600_asic { · 1931 unmodified lines
19321932 unsigned tiling_group_size;
19331933 unsigned tile_config;
19341934 unsigned backend_map;
1935+ unsigned active_simds;
19351936 };
19361937
19371938 struct rv770_asic {
@@ -1957,6 +1958,7 @@ struct rv770_asic { · 19 unmodified lines
19571958 unsigned tiling_group_size;
19581959 unsigned tile_config;
19591960 unsigned backend_map;
1961+ unsigned active_simds;
19601962 };
19611963
19621964 struct evergreen_asic {
@@ -1983,6 +1985,7 @@ struct evergreen_asic { · 20 unmodified lines
19831985 unsigned tiling_group_size;
19841986 unsigned tile_config;
19851987 unsigned backend_map;
1988+ unsigned active_simds;
19861989 };
19871990
19881991 struct cayman_asic {
@@ -2021,6 +2024,7 @@ struct cayman_asic { · 32 unmodified lines
20212024 unsigned multi_gpu_tile_size;
20222025
20232026 unsigned tile_config;
2027+ unsigned active_simds;
20242028 };
20252029
20262030 struct si_asic {
@@ -2051,6 +2055,7 @@ struct si_asic { · 24 unmodified lines
20512055
20522056 unsigned tile_config;
20532057 uint32_t tile_mode_array[32];
2058+ uint32_t active_cus;
20542059 };
20552060
20562061 struct cik_asic {
@@ -2082,6 +2087,7 @@ struct cik_asic { · 25 unmodified lines
20822087 unsigned tile_config;
20832088 uint32_t tile_mode_array[32];
20842089 uint32_t macrotile_mode_array[16];
2090+ uint32_t active_cus;
20852091 };
20862092
20872093 union radeon_asic_config {
drivers/gpu/drm/radeon/radeon_drv.c+2−1
@@ -81,9 +81,10 @@ · 80 unmodified lines
8181 * 2.37.0 - allow GS ring setup on r6xx/r7xx
8282 * 2.38.0 - RADEON_GEM_OP (GET_INITIAL_DOMAIN, SET_INITIAL_DOMAIN),
8383 * CIK: 1D and linear tiling modes contain valid PIPE_CONFIG
84+ * 2.39.0 - Add INFO query for number of active CUs
8485 */
8586 #define KMS_DRIVER_MAJOR 2
86−#define KMS_DRIVER_MINOR 38
87+#define KMS_DRIVER_MINOR 39
8788 #define KMS_DRIVER_PATCHLEVEL 0
8889 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
8990 int radeon_driver_unload_kms(struct drm_device *dev);
drivers/gpu/drm/radeon/radeon_kms.c+16−0
@@ -513,6 +513,22 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file · 512 unmodified lines
513513 value_size = sizeof(uint64_t);
514514 value64 = atomic64_read(&rdev->gtt_usage);
515515 break;
516+ case RADEON_INFO_ACTIVE_CU_COUNT:
517+ if (rdev->family >= CHIP_BONAIRE)
518+ *value = rdev->config.cik.active_cus;
519+ else if (rdev->family >= CHIP_TAHITI)
520+ *value = rdev->config.si.active_cus;
521+ else if (rdev->family >= CHIP_CAYMAN)
522+ *value = rdev->config.cayman.active_simds;
523+ else if (rdev->family >= CHIP_CEDAR)
524+ *value = rdev->config.evergreen.active_simds;
525+ else if (rdev->family >= CHIP_RV770)
526+ *value = rdev->config.rv770.active_simds;
527+ else if (rdev->family >= CHIP_R600)
528+ *value = rdev->config.r600.active_simds;
529+ else
530+ *value = 1;
531+ break;
516532 default:
517533 DRM_DEBUG_KMS("Invalid request %d\n", info->request);
518534 return -EINVAL;
drivers/gpu/drm/radeon/rv770.c+3−0
@@ -1327,6 +1327,9 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 1326 unmodified lines
13271327 if (tmp < rdev->config.rv770.max_simds) {
13281328 rdev->config.rv770.max_simds = tmp;
13291329 }
1330+ tmp = rdev->config.rv770.max_simds -
1331+ r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
1332+ rdev->config.rv770.active_simds = tmp;
13301333
13311334 switch (rdev->config.rv770.max_tile_pipes) {
13321335 case 1:
drivers/gpu/drm/radeon/si.c+10−1
@@ -71,6 +71,7 @@ MODULE_FIRMWARE("radeon/HAINAN_mc2.bin"); · 70 unmodified lines
7171 MODULE_FIRMWARE("radeon/HAINAN_rlc.bin");
7272 MODULE_FIRMWARE("radeon/HAINAN_smc.bin");
7373
74+static u32 si_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh);
7475 static void si_pcie_gen3_enable(struct radeon_device *rdev);
7576 static void si_program_aspm(struct radeon_device *rdev);
7677 extern void sumo_rlc_fini(struct radeon_device *rdev);
@@ -2900,7 +2901,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 2823 unmodified lines
29002901 u32 sx_debug_1;
29012902 u32 hdp_host_path_cntl;
29022903 u32 tmp;
2903− int i, j;
2904+ int i, j, k;
29042905
29052906 switch (rdev->family) {
29062907 case CHIP_TAHITI:
@@ -3098,6 +3099,14 @@ static void si_gpu_init(struct radeon_device *rdev) · 191 unmodified lines
30983099 rdev->config.si.max_sh_per_se,
30993100 rdev->config.si.max_cu_per_sh);
31003101
3102+ for (i = 0; i < rdev->config.si.max_shader_engines; i++) {
3103+ for (j = 0; j < rdev->config.si.max_sh_per_se; j++) {
3104+ for (k = 0; k < rdev->config.si.max_cu_per_sh; k++) {
3105+ rdev->config.si.active_cus +=
3106+ hweight32(si_get_cu_active_bitmap(rdev, i, j));
3107+ }
3108+ }
3109+ }
31013110
31023111 /* set HW defaults for 3D engine */
31033112 WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) |
include/uapi/drm/radeon_drm.h+1−1
@@ -1007,7 +1007,7 @@ struct drm_radeon_cs { · 1006 unmodified lines
10071007 #define RADEON_INFO_NUM_BYTES_MOVED 0x1d
10081008 #define RADEON_INFO_VRAM_USAGE 0x1e
10091009 #define RADEON_INFO_GTT_USAGE 0x1f
1010−
1010+#define RADEON_INFO_ACTIVE_CU_COUNT 0x20
10111011
10121012 struct drm_radeon_info {
10131013 uint32_t request;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t