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

ac: query high bits of 32-bit address space

Browse Source
This commit is contained in:
Marek Olšák
2018-02-02 18:22:15 +01:00
parent 16be55da94
commit 0977b7f7b3
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -74,7 +74,7 @@ AC_SUBST([OPENCL_VERSION])
# in the first entry. # in the first entry.
LIBDRM_REQUIRED=2.4.75 LIBDRM_REQUIRED=2.4.75
LIBDRM_RADEON_REQUIRED=2.4.71 LIBDRM_RADEON_REQUIRED=2.4.71
LIBDRM_AMDGPU_REQUIRED=2.4.89 LIBDRM_AMDGPU_REQUIRED=2.4.90
LIBDRM_INTEL_REQUIRED=2.4.75 LIBDRM_INTEL_REQUIRED=2.4.75
LIBDRM_NVVIEUX_REQUIRED=2.4.66 LIBDRM_NVVIEUX_REQUIRED=2.4.66
LIBDRM_NOUVEAU_REQUIRED=2.4.66 LIBDRM_NOUVEAU_REQUIRED=2.4.66

2
meson.build
View File

@@ -980,7 +980,7 @@ dep_libdrm_nouveau = []
dep_libdrm_etnaviv = [] dep_libdrm_etnaviv = []
dep_libdrm_freedreno = [] dep_libdrm_freedreno = []
if with_amd_vk or with_gallium_radeonsi if with_amd_vk or with_gallium_radeonsi
dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.89') dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.90')
endif endif
if (with_gallium_radeonsi or with_dri_r100 or with_dri_r200 or if (with_gallium_radeonsi or with_dri_r100 or with_dri_r200 or
with_gallium_r300 or with_gallium_r600) with_gallium_r300 or with_gallium_r600)

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

@@ -226,6 +226,12 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
return false; return false;
} }
r = amdgpu_query_sw_info(dev, amdgpu_sw_info_address32_hi, &info->address32_hi);
if (r) {
fprintf(stderr, "amdgpu: amdgpu_query_sw_info(address32_hi) failed.\n");
return false;
}
/* Set chip identification. */ /* Set chip identification. */
info->pci_id = amdinfo->asic_id; /* TODO: is this correct? */ info->pci_id = amdinfo->asic_id; /* TODO: is this correct? */
info->vce_harvest_config = amdinfo->vce_harvest_config; info->vce_harvest_config = amdinfo->vce_harvest_config;
@@ -371,6 +377,7 @@ void ac_print_gpu_info(struct radeon_info *info)
printf("max_alloc_size = %i MB\n", printf("max_alloc_size = %i MB\n",
(int)DIV_ROUND_UP(info->max_alloc_size, 1024*1024)); (int)DIV_ROUND_UP(info->max_alloc_size, 1024*1024));
printf("min_alloc_size = %u\n", info->min_alloc_size); printf("min_alloc_size = %u\n", info->min_alloc_size);
printf("address32_hi = %u\n", info->address32_hi);
printf("has_dedicated_vram = %u\n", info->has_dedicated_vram); printf("has_dedicated_vram = %u\n", info->has_dedicated_vram);
printf("has_virtual_memory = %i\n", info->has_virtual_memory); printf("has_virtual_memory = %i\n", info->has_virtual_memory);
printf("gfx_ib_pad_with_type2 = %i\n", info->gfx_ib_pad_with_type2); printf("gfx_ib_pad_with_type2 = %i\n", info->gfx_ib_pad_with_type2);

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

@@ -57,6 +57,7 @@ struct radeon_info {
uint64_t vram_vis_size; uint64_t vram_vis_size;
uint64_t max_alloc_size; uint64_t max_alloc_size;
uint32_t min_alloc_size; uint32_t min_alloc_size;
uint32_t address32_hi;
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;