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

turnip: split up gmem/tile alignment

Browse Source 
Note: the x1/y1 align in tu6_emit_blit_scissor was broken

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3783>
This commit is contained in:
Jonathan Marek
2020-02-18 08:54:15 -05:00
committed by Marge Bot
parent f494799a7f
commit 86d1a4c907
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/freedreno/vulkan/tu_cmd_buffer.c
View File

@@ -123,7 +123,6 @@ force_sysmem(const struct tu_cmd_buffer *cmd,
const struct VkRect2D *render_area) const struct VkRect2D *render_area)
{ {
const struct tu_framebuffer *fb = cmd->state.framebuffer; const struct tu_framebuffer *fb = cmd->state.framebuffer;
const struct tu_physical_device *device = cmd->device->physical_device;
bool has_linear_mipmapped_store = false; bool has_linear_mipmapped_store = false;
const struct tu_render_pass *pass = cmd->state.pass; const struct tu_render_pass *pass = cmd->state.pass;
@@ -170,7 +169,7 @@ force_sysmem(const struct tu_cmd_buffer *cmd,
* work around this, we force-enable sysmem rendering. * work around this, we force-enable sysmem rendering.
*/ */
const uint32_t y2 = render_area->offset.y + render_area->extent.height; const uint32_t y2 = render_area->offset.y + render_area->extent.height;
const uint32_t aligned_y2 = ALIGN_POT(y2, device->tile_align_h); const uint32_t aligned_y2 = ALIGN_POT(y2, GMEM_ALIGN_H);
return has_linear_mipmapped_store && aligned_y2 > fb->height; return has_linear_mipmapped_store && aligned_y2 > fb->height;
} }
@@ -180,9 +179,9 @@ tu_tiling_config_update_tile_layout(struct tu_tiling_config *tiling,
const struct tu_device *dev, const struct tu_device *dev,
uint32_t pixels) uint32_t pixels)
{ {
const uint32_t tile_align_w = dev->physical_device->tile_align_w; const uint32_t tile_align_w = 64; /* note: 32 when no input attachments */
const uint32_t tile_align_h = dev->physical_device->tile_align_h; const uint32_t tile_align_h = 16;
const uint32_t max_tile_width = 1024; /* A6xx */ const uint32_t max_tile_width = 1024;
/* note: don't offset the tiling config by render_area.offset, /* note: don't offset the tiling config by render_area.offset,
* because binning pass can't deal with it * because binning pass can't deal with it
@@ -670,12 +669,11 @@ tu6_emit_blit_scissor(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool align)
uint32_t x2 = x1 + render_area->extent.width - 1; uint32_t x2 = x1 + render_area->extent.width - 1;
uint32_t y2 = y1 + render_area->extent.height - 1; uint32_t y2 = y1 + render_area->extent.height - 1;
/* TODO: alignment requirement seems to be less than tile_align_w/h */
if (align) { if (align) {
x1 = x1 & ~cmd->device->physical_device->tile_align_w; x1 = x1 & ~(GMEM_ALIGN_W - 1);
y1 = y1 & ~cmd->device->physical_device->tile_align_h; y1 = y1 & ~(GMEM_ALIGN_H - 1);
x2 = ALIGN_POT(x2 + 1, cmd->device->physical_device->tile_align_w) - 1; x2 = ALIGN_POT(x2 + 1, GMEM_ALIGN_W) - 1;
y2 = ALIGN_POT(y2 + 1, cmd->device->physical_device->tile_align_h) - 1; y2 = ALIGN_POT(y2 + 1, GMEM_ALIGN_H) - 1;
} }
tu_cs_emit_regs(cs, tu_cs_emit_regs(cs,

4
src/freedreno/vulkan/tu_device.c
View File

@@ -265,8 +265,6 @@ tu_physical_device_init(struct tu_physical_device *device,
switch (device->gpu_id) { switch (device->gpu_id) {
case 618: case 618:
device->tile_align_w = 64;
device->tile_align_h = 16;
device->magic.RB_UNKNOWN_8E04_blit = 0x00100000; device->magic.RB_UNKNOWN_8E04_blit = 0x00100000;
device->ccu_offset_gmem = 0x7c000; /* 0x7e000 in some cases? */ device->ccu_offset_gmem = 0x7c000; /* 0x7e000 in some cases? */
device->ccu_offset_bypass = 0x10000; device->ccu_offset_bypass = 0x10000;
@@ -275,8 +273,6 @@ tu_physical_device_init(struct tu_physical_device *device,
break; break;
case 630: case 630:
case 640: case 640:
device->tile_align_w = 64;
device->tile_align_h = 16;
device->magic.RB_UNKNOWN_8E04_blit = 0x01000000; device->magic.RB_UNKNOWN_8E04_blit = 0x01000000;
device->ccu_offset_gmem = 0xf8000; device->ccu_offset_gmem = 0xf8000;
device->ccu_offset_bypass = 0x20000; device->ccu_offset_bypass = 0x20000;

6
src/freedreno/vulkan/tu_pass.c
View File

@@ -360,8 +360,6 @@ tu_GetRenderAreaGranularity(VkDevice _device,
VkRenderPass renderPass, VkRenderPass renderPass,
VkExtent2D *pGranularity) VkExtent2D *pGranularity)
{ {
TU_FROM_HANDLE(tu_device, device, _device); pGranularity->width = GMEM_ALIGN_W;
pGranularity->height = GMEM_ALIGN_H;
pGranularity->width = device->physical_device->tile_align_w;
pGranularity->height = device->physical_device->tile_align_h;
} }

4
src/freedreno/vulkan/tu_private.h
View File

@@ -314,10 +314,10 @@ struct tu_physical_device
unsigned gpu_id; unsigned gpu_id;
uint32_t gmem_size; uint32_t gmem_size;
uint64_t gmem_base; uint64_t gmem_base;
uint32_t tile_align_w;
uint32_t tile_align_h;
uint32_t ccu_offset_gmem; uint32_t ccu_offset_gmem;
uint32_t ccu_offset_bypass; uint32_t ccu_offset_bypass;
#define GMEM_ALIGN_W 16
#define GMEM_ALIGN_H 4
struct { struct {
uint32_t RB_UNKNOWN_8E04_blit; /* for CP_BLIT's */ uint32_t RB_UNKNOWN_8E04_blit; /* for CP_BLIT's */