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

freedreno: Drop the extra offset field for mipmap slices.

Browse Source 
We can just bake the UBWC-goes-first delta into the slices at setup time.
I did have to fix up the resource shadowing swap path to swap the slice
fields, as it was missing and regressed the format reinterpets otherwise.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Eric Anholt
2019-11-21 14:53:58 -08:00
parent 69d7782b15
commit 97be9503bb
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/freedreno/fdl/freedreno_layout.h
View File

@@ -100,7 +100,6 @@ struct fdl_layout {
uint32_t width0, height0, depth0; uint32_t width0, height0, depth0;
/* UBWC specific fields: */ /* UBWC specific fields: */
uint32_t offset; /* offset to start of pixel data */
uint32_t ubwc_offset; /* offset to UBWC meta data */ uint32_t ubwc_offset; /* offset to UBWC meta data */
uint32_t ubwc_pitch; uint32_t ubwc_pitch;
uint32_t ubwc_size; uint32_t ubwc_size;
@@ -119,9 +118,7 @@ static inline uint32_t
fdl_surface_offset(const struct fdl_layout *layout, unsigned level, unsigned layer) fdl_surface_offset(const struct fdl_layout *layout, unsigned level, unsigned layer)
{ {
const struct fdl_slice *slice = &layout->slices[level]; const struct fdl_slice *slice = &layout->slices[level];
unsigned offset = slice->offset; return slice->offset + fdl_layer_stride(layout, level) * layer;
offset += fdl_layer_stride(layout, level) * layer;
return offset + layout->offset;
} }
static inline uint32_t static inline uint32_t

6
src/gallium/drivers/freedreno/a6xx/fd6_resource.c
View File

@@ -262,8 +262,12 @@ fd6_fill_ubwc_buffer_sizes(struct fd_resource *rsc)
* because it is what the kernel expects for scanout. For non-2D we * because it is what the kernel expects for scanout. For non-2D we
* could just use a separate UBWC buffer.. * could just use a separate UBWC buffer..
*/ */
for (int level = 0; level <= prsc->last_level; level++) {
struct fdl_slice *slice = fd_resource_slice(rsc, level);
slice->offset += meta_size;
}
rsc->layout.ubwc_offset = 0; rsc->layout.ubwc_offset = 0;
rsc->layout.offset = meta_size;
rsc->layout.ubwc_pitch = meta_stride; rsc->layout.ubwc_pitch = meta_stride;
rsc->layout.ubwc_size = meta_size >> 2; /* in dwords??? */ rsc->layout.ubwc_size = meta_size >> 2; /* in dwords??? */
rsc->layout.tile_mode = TILE6_3; rsc->layout.tile_mode = TILE6_3;

3
src/gallium/drivers/freedreno/freedreno_resource.c
View File

@@ -223,7 +223,8 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc,
/* TODO valid_buffer_range?? */ /* TODO valid_buffer_range?? */
swap(rsc->bo, shadow->bo); swap(rsc->bo, shadow->bo);
swap(rsc->write_batch, shadow->write_batch); swap(rsc->write_batch, shadow->write_batch);
swap(rsc->layout.offset, shadow->layout.offset); for (int level = 0; level <= prsc->last_level; level++)
swap(rsc->layout.slices[level], shadow->layout.slices[level]);
swap(rsc->layout.ubwc_offset, shadow->layout.ubwc_offset); swap(rsc->layout.ubwc_offset, shadow->layout.ubwc_offset);
swap(rsc->layout.ubwc_pitch, shadow->layout.ubwc_pitch); swap(rsc->layout.ubwc_pitch, shadow->layout.ubwc_pitch);
swap(rsc->layout.ubwc_size, shadow->layout.ubwc_size); swap(rsc->layout.ubwc_size, shadow->layout.ubwc_size);