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

panfrost: Don't pass a panfrost_device to panfrost_afbc_can_tile()

Browse Source 
Pass the arch directly.

While at it, make the helper a static inline function defined in
pan_texture.h.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26698>
This commit is contained in:
Boris Brezillon
2023-12-05 19:17:10 +01:00
committed by Marge Bot
parent a758e95077
commit fbcc85108b
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_resource.c
View File

@@ -380,7 +380,7 @@ static bool
panfrost_should_tile_afbc(const struct panfrost_device *dev, panfrost_should_tile_afbc(const struct panfrost_device *dev,
const struct panfrost_resource *pres) const struct panfrost_resource *pres)
{ {
return panfrost_afbc_can_tile(dev) && pres->base.width0 >= 128 && return panfrost_afbc_can_tile(dev->arch) && pres->base.width0 >= 128 &&
pres->base.height0 >= 128 && !(dev->debug & PAN_DBG_FORCE_PACK); pres->base.height0 >= 128 && !(dev->debug & PAN_DBG_FORCE_PACK);
} }

2
src/gallium/drivers/panfrost/pan_screen.c
View File

@@ -619,7 +619,7 @@ panfrost_walk_dmabuf_modifiers(struct pipe_screen *screen,
bool afbc = bool afbc =
dev->has_afbc && panfrost_format_supports_afbc(dev->arch, format); dev->has_afbc && panfrost_format_supports_afbc(dev->arch, format);
bool ytr = panfrost_afbc_can_ytr(format); bool ytr = panfrost_afbc_can_ytr(format);
bool tiled_afbc = panfrost_afbc_can_tile(dev); bool tiled_afbc = panfrost_afbc_can_tile(dev->arch);
unsigned count = 0; unsigned count = 0;

10
src/panfrost/lib/pan_afbc.c
View File

@@ -191,13 +191,3 @@ panfrost_afbc_can_pack(enum pipe_format format)
return desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB; return desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB;
} }
/*
* Check if the device supports AFBC with tiled headers (and hence also solid
* colour blocks).
*/
bool
panfrost_afbc_can_tile(const struct panfrost_device *dev)
{
return (dev->arch >= 7);
}

9
src/panfrost/lib/pan_texture.h
View File

@@ -240,7 +240,14 @@ bool panfrost_afbc_can_ytr(enum pipe_format format);
bool panfrost_afbc_can_pack(enum pipe_format format); bool panfrost_afbc_can_pack(enum pipe_format format);
bool panfrost_afbc_can_tile(const struct panfrost_device *dev); /*
* Check if a gen supports AFBC with tiled headers (and hence also solid
* colour blocks).
*/
static inline bool panfrost_afbc_can_tile(unsigned arch)
{
return arch >= 7;
}
/* /*
* Represents the block size of a single plane. For AFBC, this represents the * Represents the block size of a single plane. For AFBC, this represents the