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

tu/a8xx: fix tu_desc_set_ubwc() to avoid unwanted bitfield override

Browse source 
Current implementation of tu_desc_set_ubwc() for A8XX will override
bitfields in the upper half of A8XX_TEX_MEMOBJ[5], leading to incorrect
behavior.

Fix this by using pkt_field_set() to correctly set the relevant descriptor
fields. Similarly, tu_desc_get_ubwc() is changed to use pkt_field_get() to
retrieve relevant field data from which it forms the returned address.

Fixes CTS tests on a8xx:
  dEQP-VK.api.copy_and_blit.*.resolve_image.copy_with_regions_before_resolving.*

Signed-off-by: Zan Dobersek <zdobersek@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40538>
This commit is contained in:
Zan Dobersek 2026-03-20 14:44:42 +01:00 • committed by Marge Bot
parent e2bf574589
commit 34e0d5c698
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/freedreno/vulkan/tu_descriptor_set.h
View file

@ -468,17 +468,17 @@ template <chip CHIP>
static inline uint64_t
tu_desc_get_ubwc(uint32_t *desc)
{
uint64_t addr = 0;
if ((CHIP >= A8XX) && (desc[4] & A8XX_TEX_MEMOBJ_4_FLAG)) {
uint64_t addr = desc[4] & ~0x1f;
addr |= (uint64_t)(desc[5] & 0xffff) << 32;
return addr;
addr = pkt_field_get(A8XX_TEX_MEMOBJ_4_FLAG_LO, desc[4]) << 6;
addr |= (uint64_t)pkt_field_get(A8XX_TEX_MEMOBJ_5_FLAG_HI, desc[5]) << 32;
} else if ((CHIP <= A7XX) && (desc[3] & A6XX_TEX_MEMOBJ_3_FLAG)) {
uint64_t addr = desc[7];
addr |= (uint64_t)(desc[8] & 0xffff) << 32;
return addr;
} else {
return 0;
addr = pkt_field_get(A6XX_TEX_MEMOBJ_7_FLAG_LO, desc[7]) << 5;
addr |= (uint64_t)pkt_field_get(A6XX_TEX_MEMOBJ_8_FLAG_HI, desc[8]) << 32;
}
return addr;
}
template <chip CHIP>
@ -486,18 +486,17 @@ static inline void
tu_desc_set_ubwc(uint32_t *desc, uint64_t addr)
{
if (CHIP >= A8XX) {
assert(!(addr & 0x1f));
if (addr) {
desc[4] = (desc[4] & 0x1f) | addr;
desc[5] = (desc[5] & 0xffff) | addr >> 32;
desc[4] = pkt_field_set(A8XX_TEX_MEMOBJ_4_FLAG_LO, desc[4], addr);
desc[5] = pkt_field_set(A8XX_TEX_MEMOBJ_5_FLAG_HI, desc[5], addr >> 32);
desc[4] |= A8XX_TEX_MEMOBJ_4_FLAG;
} else {
desc[4] &= ~A8XX_TEX_MEMOBJ_4_FLAG;
}
} else {
if (addr) {
desc[7] = addr;
desc[8] = (desc[8] & 0xffff) | addr >> 32;
desc[7] = pkt_field_set(A6XX_TEX_MEMOBJ_7_FLAG_LO, desc[7], addr);
desc[8] = pkt_field_set(A6XX_TEX_MEMOBJ_8_FLAG_HI, desc[8], addr >> 32);
desc[3] |= A6XX_TEX_MEMOBJ_3_FLAG;
} else {
desc[3] &= ~A6XX_TEX_MEMOBJ_3_FLAG;