KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/a6xx: split up gmem/tile alignment requirements 

RB_BLIT has a granularity of 16x4, but tile sizes must be 32x16 aligned.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4611>
This commit is contained in:
Jonathan Marek 2020-05-12 21:56:53 -04:00 committed by Marge Bot
parent bf024c96ad
commit f6f8a19092
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/freedreno/freedreno_gmem.c
View File

@ -184,8 +184,8 @@ layout_gmem(struct gmem_key *key, uint32_t nbins_x, uint32_t nbins_y,
return false;
uint32_t bin_w, bin_h;
bin_w = div_align(key->width, nbins_x, screen->gmem_alignw);
bin_h = div_align(key->height, nbins_y, screen->gmem_alignh);
bin_w = div_align(key->width, nbins_x, screen->tile_alignw);
bin_h = div_align(key->height, nbins_y, screen->tile_alignh);
gmem->bin_w = bin_w;
gmem->bin_h = bin_h;
@ -244,7 +244,7 @@ gmem_stateobj_init(struct fd_screen *screen, struct gmem_key *key)
/* first, find a bin width that satisfies the maximum width
* restrictions:
*/
while (div_align(key->width, nbins_x, screen->gmem_alignw) > max_width) {
while (div_align(key->width, nbins_x, screen->tile_alignw) > max_width) {
nbins_x++;
}

14
src/gallium/drivers/freedreno/freedreno_screen.c
View File

@ -944,16 +944,18 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
}
if (screen->gpu_id >= 600) {
screen->gmem_alignw = 32;
screen->gmem_alignh = 32;
screen->gmem_alignw = 16;
screen->gmem_alignh = 4;
screen->tile_alignw = 32;
screen->tile_alignh = 32;
screen->num_vsc_pipes = 32;
} else if (screen->gpu_id >= 500) {
screen->gmem_alignw = 64;
screen->gmem_alignh = 32;
screen->gmem_alignw = screen->tile_alignw = 64;
screen->gmem_alignh = screen->tile_alignh = 32;
screen->num_vsc_pipes = 16;
} else {
screen->gmem_alignw = 32;
screen->gmem_alignh = 32;
screen->gmem_alignw = screen->tile_alignw = 32;
screen->gmem_alignh = screen->tile_alignh = 32;
screen->num_vsc_pipes = 8;
}

3
src/gallium/drivers/freedreno/freedreno_screen.h
View File

@ -70,7 +70,8 @@ struct fd_screen {
uint32_t max_freq;
uint32_t ram_size;
uint32_t max_rts; /* max # of render targets */
uint32_t gmem_alignw, gmem_alignh;
uint32_t gmem_alignw, gmem_alignh; /* gmem load/store granularity */
uint32_t tile_alignw, tile_alignh; /* alignment for tile sizes */
uint32_t num_vsc_pipes;
uint32_t priority_mask;
bool has_timestamp;