diff options
author | Marek Olšák <marek.olsak@amd.com> | 2016-01-19 17:24:57 +0100 |
---|---|---|
committer | Marek Olšák <marek.olsak@amd.com> | 2016-01-22 15:02:40 +0100 |
commit | 0d8e4f958f83e0b67f07030c661a30b4e7c19425 (patch) | |
tree | 1d468251f8b1e316b114e9782d97589a84f1e436 /src/gallium/winsys | |
parent | 99dfeb01bd5c3e059968e934f3ec88b2fe43e3f4 (diff) | |
download | external_mesa3d-0d8e4f958f83e0b67f07030c661a30b4e7c19425.zip external_mesa3d-0d8e4f958f83e0b67f07030c661a30b4e7c19425.tar.gz external_mesa3d-0d8e4f958f83e0b67f07030c661a30b4e7c19425.tar.bz2 |
gallium/radeon: rename max_compute_units -> num_good_compute_units
radeon sets this correctly, but not amdgpu
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 6 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 39d3aa4..9835024 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -273,10 +273,10 @@ static boolean do_winsys_init(struct amdgpu_winsys *ws) for (j = 0; j < ws->info.max_sh_per_se; j++) { unsigned max = util_last_bit(ws->amdinfo.cu_bitmap[i][j]); - if (ws->info.max_compute_units < max) - ws->info.max_compute_units = max; + if (ws->info.num_good_compute_units < max) + ws->info.num_good_compute_units = max; } - ws->info.max_compute_units *= ws->info.max_se * ws->info.max_sh_per_se; + ws->info.num_good_compute_units *= ws->info.max_se * ws->info.max_sh_per_se; memcpy(ws->info.si_tile_mode_array, ws->amdinfo.gb_tile_mode, sizeof(ws->amdinfo.gb_tile_mode)); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index c7e058bf..8a1ed3a 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -419,9 +419,9 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) &ws->info.r600_max_pipes); /* All GPUs have at least one compute unit */ - ws->info.max_compute_units = 1; + ws->info.num_good_compute_units = 1; radeon_get_drm_value(ws->fd, RADEON_INFO_ACTIVE_CU_COUNT, NULL, - &ws->info.max_compute_units); + &ws->info.num_good_compute_units); radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_SE, NULL, &ws->info.max_se); |