OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac: add radeon_info::num_{sdma,compute}_rings

Browse Source 
Vulkan needs them.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-05-12 01:04:56 +02:00
parent c488bf24ed
commit 6c01c4b907
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/common/ac_gpu_info.c
View File

@@ -88,7 +88,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
{ {
struct amdgpu_buffer_size_alignments alignment_info = {}; struct amdgpu_buffer_size_alignments alignment_info = {};
struct amdgpu_heap_info vram, vram_vis, gtt; struct amdgpu_heap_info vram, vram_vis, gtt;
struct drm_amdgpu_info_hw_ip dma = {}, uvd = {}, vce = {}; struct drm_amdgpu_info_hw_ip dma = {}, compute = {}, uvd = {}, vce = {};
uint32_t vce_version = 0, vce_feature = 0, uvd_version = 0, uvd_feature = 0; uint32_t vce_version = 0, vce_feature = 0, uvd_version = 0, uvd_feature = 0;
uint32_t unused_feature; uint32_t unused_feature;
int r, i, j; int r, i, j;
@@ -145,6 +145,12 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
return false; return false;
} }
r = amdgpu_query_hw_ip_info(dev, AMDGPU_HW_IP_COMPUTE, 0, &compute);
if (r) {
fprintf(stderr, "amdgpu: amdgpu_query_hw_ip_info(compute) failed.\n");
return false;
}
r = amdgpu_query_hw_ip_info(dev, AMDGPU_HW_IP_UVD, 0, &uvd); r = amdgpu_query_hw_ip_info(dev, AMDGPU_HW_IP_UVD, 0, &uvd);
if (r) { if (r) {
fprintf(stderr, "amdgpu: amdgpu_query_hw_ip_info(uvd) failed.\n"); fprintf(stderr, "amdgpu: amdgpu_query_hw_ip_info(uvd) failed.\n");
@@ -254,7 +260,12 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
256 << G_0098F8_PIPE_INTERLEAVE_SIZE_GFX6(amdinfo->gb_addr_cfg); 256 << G_0098F8_PIPE_INTERLEAVE_SIZE_GFX6(amdinfo->gb_addr_cfg);
} }
info->has_virtual_memory = true; info->has_virtual_memory = true;
info->has_sdma = dma.available_rings != 0;
assert(util_is_power_of_two(dma.available_rings + 1));
assert(util_is_power_of_two(compute.available_rings + 1));
info->num_sdma_rings = util_bitcount(dma.available_rings);
info->num_compute_rings = util_bitcount(compute.available_rings);
/* Get the number of good compute units. */ /* Get the number of good compute units. */
info->num_good_compute_units = 0; info->num_good_compute_units = 0;

3
src/amd/common/ac_gpu_info.h
View File

@@ -50,8 +50,9 @@ struct radeon_info {
bool has_dedicated_vram; bool has_dedicated_vram;
bool has_virtual_memory; bool has_virtual_memory;
bool gfx_ib_pad_with_type2; bool gfx_ib_pad_with_type2;
bool has_sdma;
bool has_uvd; bool has_uvd;
uint32_t num_sdma_rings;
uint32_t num_compute_rings;
uint32_t uvd_fw_version; uint32_t uvd_fw_version;
uint32_t vce_fw_version; uint32_t vce_fw_version;
uint32_t me_fw_version; uint32_t me_fw_version;

4
src/gallium/drivers/radeon/r600_pipe_common.c
View File

@@ -672,7 +672,7 @@ bool r600_common_context_init(struct r600_common_context *rctx,
if (!rctx->ctx) if (!rctx->ctx)
return false; return false;
if (rscreen->info.has_sdma && !(rscreen->debug_flags & DBG_NO_ASYNC_DMA)) { if (rscreen->info.num_sdma_rings && !(rscreen->debug_flags & DBG_NO_ASYNC_DMA)) {
rctx->dma.cs = rctx->ws->cs_create(rctx->ctx, RING_DMA, rctx->dma.cs = rctx->ws->cs_create(rctx->ctx, RING_DMA,
r600_flush_dma_ring, r600_flush_dma_ring,
rctx); rctx);
@@ -1395,7 +1395,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
(int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024)); (int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024));
printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory); printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory);
printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2); printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2);
printf("has_sdma = %i\n", rscreen->info.has_sdma); printf("num_sdma_rings = %i\n", rscreen->info.num_sdma_rings);
printf("has_uvd = %i\n", rscreen->info.has_uvd); printf("has_uvd = %i\n", rscreen->info.has_uvd);
printf("me_fw_version = %i\n", rscreen->info.me_fw_version); printf("me_fw_version = %i\n", rscreen->info.me_fw_version);
printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version); printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version);

4
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
View File

@@ -305,10 +305,10 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
} }
/* Check for dma */ /* Check for dma */
ws->info.has_sdma = false; ws->info.num_sdma_rings = 0;
/* DMA is disabled on R700. There is IB corruption and hangs. */ /* DMA is disabled on R700. There is IB corruption and hangs. */
if (ws->info.chip_class >= EVERGREEN && ws->info.drm_minor >= 27) { if (ws->info.chip_class >= EVERGREEN && ws->info.drm_minor >= 27) {
ws->info.has_sdma = true; ws->info.num_sdma_rings = 1;
} }
/* Check for UVD and VCE */ /* Check for UVD and VCE */