gallium/radeon: remove tile_mode_array_valid flags
authorMarek Olšák <marek.olsak@amd.com>
Sun, 1 May 2016 12:11:16 +0000 (14:11 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 2 May 2016 20:49:25 +0000 (22:49 +0200)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
src/gallium/drivers/radeon/r600_pipe_common.c
src/gallium/drivers/radeon/radeon_winsys.h
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c

index 3c08221ca645914e075dcf4489eb8604ca3cee48..dae236943c1bafa85feeafa6fe6e59482cfda812 100644 (file)
@@ -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;
 }
index defa67d8bc76f061d35646385214acf996a7f617..626f766bcbcc0f0ed15012d63b3673874771fbad 100644 (file)
@@ -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];
 };
 
index 1177d3e3c3ae91839c7dfce4f8e6c15052885424..e6db145616cacc4100148c8b939a21488e202d32 100644 (file)
@@ -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;
 
index 702d0733bfaec756fffa12fbea26fc2b40d96d9b..a5b81bc33389960fc94be59d5c55381348a9d209 100644 (file)
@@ -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.