fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ac/gpu_info: add kernel_flushes_hdp_before_ib

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit b81149e258)

Conflicts:
	src/amd/common/ac_gpu_info.c

Conflicts resolved by Dylan
This commit is contained in:
Marek Olšák 2018-05-02 18:27:18 -04:00 • committed by Dylan Baker
parent 19655023a9
commit e979b79cec
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/common/ac_gpu_info.c
View file

@ -342,6 +342,8 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
/* TODO: Enable this once the kernel handles it efficiently. */
info->has_local_buffers = info->drm_minor >= 20 &&
!info->has_dedicated_vram;
info->kernel_flushes_hdp_before_ib = true;
info->num_render_backends = amdinfo->rb_pipes;
info->clock_crystal_freq = amdinfo->gpu_counter_freq;
if (!info->clock_crystal_freq) {
@ -484,6 +486,7 @@ void ac_print_gpu_info(struct radeon_info *info)
printf(" has_fence_to_handle = %u\n", info->has_fence_to_handle);
printf(" has_ctx_priority = %u\n", info->has_ctx_priority);
printf(" has_local_buffers = %u\n", info->has_local_buffers);
printf(" kernel_flushes_hdp_before_ib = %u\n", info->kernel_flushes_hdp_before_ib);
printf("Shader core info:\n");
printf(" max_shader_clock = %i\n", info->max_shader_clock);

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

@ -96,6 +96,7 @@ struct radeon_info {
bool has_fence_to_handle;
bool has_ctx_priority;
bool has_local_buffers;
bool kernel_flushes_hdp_before_ib;
/* Shader cores. */
uint32_t r600_max_quad_pipes; /* wave size / 16 */

6
src/gallium/drivers/radeonsi/si_buffer.c
View file

@ -124,8 +124,7 @@ void si_init_resource_fields(struct si_screen *sscreen,
/* Older kernels didn't always flush the HDP cache before
* CS execution
*/
if (sscreen->info.drm_major == 2 &&
sscreen->info.drm_minor < 40) {
if (!sscreen->info.kernel_flushes_hdp_before_ib) {
res->domains = RADEON_DOMAIN_GTT;
res->flags |= RADEON_FLAG_GTT_WC;
break;
@ -152,8 +151,7 @@ void si_init_resource_fields(struct si_screen *sscreen,
* ensures all CPU writes finish before the GPU
* executes a command stream.
*/
if (sscreen->info.drm_major == 2 &&
sscreen->info.drm_minor < 40)
if (!sscreen->info.kernel_flushes_hdp_before_ib)
res->domains = RADEON_DOMAIN_GTT;
}

1
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
View file

@ -528,6 +528,7 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
ws->accel_working2 < 3);
ws->info.tcc_cache_line_size = 64; /* TC L2 line size on GCN */
ws->info.ib_start_alignment = 4096;
ws->info.kernel_flushes_hdp_before_ib = ws->info.drm_minor >= 40;
ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL;