fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: ignore metadata for non-zero planes

Browse source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Marek Olšák 2019-09-30 14:03:30 -04:00
parent 86e60bc265
commit 28da990bed
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/radeonsi/si_texture.c
View file

@ -760,11 +760,13 @@ static void si_set_tex_bo_metadata(struct si_screen *sscreen,
static bool si_read_tex_bo_metadata(struct si_screen *sscreen,
struct si_texture *tex,
uint64_t offset,
struct radeon_bo_metadata *md)
{
uint32_t *desc = &md->metadata[2];
if (md->size_metadata < 10 * 4 || /* at least 2(header) + 8(desc) dwords */
if (offset || /* Non-zero planes ignore metadata. */
md->size_metadata < 10 * 4 || /* at least 2(header) + 8(desc) dwords */
md->metadata[0] == 0 || /* invalid version number */
md->metadata[1] != si_get_bo_metadata_word1(sscreen)) /* invalid PCI ID */ {
/* Disable DCC because it might not be enabled. */
@ -1743,6 +1745,10 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
bool is_scanout;
int r;
/* Ignore metadata for non-zero planes. */
if (offset != 0)
dedicated = false;
if (dedicated) {
sscreen->ws->buffer_get_metadata(buf, &metadata);
si_get_display_metadata(sscreen, &surface, &metadata,
@ -1789,7 +1795,7 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
tex->buffer.external_usage = usage;
tex->num_planes = 1;
if (!si_read_tex_bo_metadata(sscreen, tex, &metadata)) {
if (!si_read_tex_bo_metadata(sscreen, tex, offset, &metadata)) {
si_texture_reference(&tex, NULL);
return NULL;
}