From 20a77397fac5c208761217a4e90ffc7eeb5b9032 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 May 2016 14:11:16 +0200 Subject: [PATCH] gallium/radeon: remove tile_mode_array_valid flags MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeon/r600_pipe_common.c | 2 -- src/gallium/drivers/radeon/radeon_winsys.h | 2 -- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 -- src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 3c08221ca64..dae236943c1 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -940,8 +940,6 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, printf("num_render_backends = %i\n", rscreen->info.num_render_backends); printf("num_tile_pipes = %i\n", rscreen->info.num_tile_pipes); printf("pipe_interleave_bytes = %i\n", rscreen->info.pipe_interleave_bytes); - printf("si_tile_mode_array_valid = %i\n", rscreen->info.si_tile_mode_array_valid); - printf("cik_macrotile_mode_array_valid = %i\n", rscreen->info.cik_macrotile_mode_array_valid); } return true; } diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index defa67d8bc7..626f766bcbc 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -278,9 +278,7 @@ struct radeon_info { uint32_t enabled_rb_mask; /* GCN harvest config */ /* Tile modes. */ - boolean si_tile_mode_array_valid; uint32_t si_tile_mode_array[32]; - boolean cik_macrotile_mode_array_valid; uint32_t cik_macrotile_mode_array[16]; }; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 1177d3e3c3a..e6db145616c 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -287,12 +287,10 @@ static boolean do_winsys_init(struct amdgpu_winsys *ws, int fd) memcpy(ws->info.si_tile_mode_array, ws->amdinfo.gb_tile_mode, sizeof(ws->amdinfo.gb_tile_mode)); - ws->info.si_tile_mode_array_valid = TRUE; ws->info.enabled_rb_mask = ws->amdinfo.enabled_rb_pipes_mask; memcpy(ws->info.cik_macrotile_mode_array, ws->amdinfo.gb_macro_tile_mode, sizeof(ws->amdinfo.gb_macro_tile_mode)); - ws->info.cik_macrotile_mode_array_valid = TRUE; ws->gart_page_size = alignment_info.size_remote; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 702d0733bfa..a5b81bc3338 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -510,7 +510,6 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) fprintf(stderr, "radeon: Kernel 3.13 is required for CIK support.\n"); return FALSE; } - ws->info.cik_macrotile_mode_array_valid = TRUE; } if (ws->info.chip_class >= SI) { @@ -519,7 +518,6 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) fprintf(stderr, "radeon: Kernel 3.10 is required for SI support.\n"); return FALSE; } - ws->info.si_tile_mode_array_valid = TRUE; } /* Hawaii with old firmware needs type2 nop packet. -- 2.30.2