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

panfrost: Pipe in compressed texture feature mask

Browse source 
So we can query at run-time as part of Gallium's checks.

v2: More explicit naming.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5856>
This commit is contained in:
Alyssa Rosenzweig 2020-07-10 10:42:24 -04:00
parent d5a9cd1b7d
commit 407a052ced
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/panfrost/encoder/pan_device.h
View file

@ -80,6 +80,9 @@ struct panfrost_device {
unsigned thread_tls_alloc; unsigned thread_tls_alloc;
unsigned quirks; unsigned quirks;
/* Bitmask of supported compressed texture formats */
uint32_t compressed_formats;
/* debug flags, see pan_util.h how to interpret */ /* debug flags, see pan_util.h how to interpret */
unsigned debug; unsigned debug;
@ -114,6 +117,9 @@ panfrost_open_device(void *memctx, int fd, struct panfrost_device *dev);
void void
panfrost_close_device(struct panfrost_device *dev); panfrost_close_device(struct panfrost_device *dev);
bool
panfrost_supports_compressed_format(struct panfrost_device *dev, unsigned fmt);
static inline struct panfrost_bo * static inline struct panfrost_bo *
pan_lookup_bo(struct panfrost_device *dev, uint32_t gem_handle) pan_lookup_bo(struct panfrost_device *dev, uint32_t gem_handle)
{ {

40
src/panfrost/encoder/pan_props.c
View file

@ -93,6 +93,45 @@ panfrost_query_thread_tls_alloc(int fd)
return 256; return 256;
} }
static uint32_t
panfrost_query_compressed_formats(int fd)
{
/* If unspecified, assume ASTC/ETC only. Factory default for Juno, and
* should exist on any Mali configuration. All hardware should report
* these texture formats but the kernel might not be new enough. */
uint32_t default_set =
(1 << MALI_ETC2_RGB8) |
(1 << MALI_ETC2_R11_UNORM) |
(1 << MALI_ETC2_RGBA8) |
(1 << MALI_ETC2_RG11_UNORM) |
(1 << MALI_ETC2_R11_SNORM) |
(1 << MALI_ETC2_RG11_SNORM) |
(1 << MALI_ETC2_RGB8A1) |
(1 << MALI_ASTC_3D_LDR) |
(1 << MALI_ASTC_3D_HDR) |
(1 << MALI_ASTC_2D_LDR) |
(1 << MALI_ASTC_2D_HDR);
return panfrost_query_raw(fd, DRM_PANFROST_PARAM_TEXTURE_FEATURES0,
false, default_set);
}
/* DRM_PANFROST_PARAM_TEXTURE_FEATURES0 will return a bitmask of supported
* compressed formats, so we offer a helper to test if a format is supported */
bool
panfrost_supports_compressed_format(struct panfrost_device *dev, unsigned fmt)
{
if (MALI_EXTRACT_TYPE(fmt) != MALI_FORMAT_COMPRESSED)
return true;
unsigned idx = fmt & ~MALI_FORMAT_COMPRESSED;
assert(idx < 32);
return dev->compressed_formats & (1 << idx);
}
/* Given a GPU ID like 0x860, return a prettified model name */ /* Given a GPU ID like 0x860, return a prettified model name */
const char * const char *
@ -124,6 +163,7 @@ panfrost_open_device(void *memctx, int fd, struct panfrost_device *dev)
dev->thread_tls_alloc = panfrost_query_thread_tls_alloc(fd); dev->thread_tls_alloc = panfrost_query_thread_tls_alloc(fd);
dev->kernel_version = drmGetVersion(fd); dev->kernel_version = drmGetVersion(fd);
dev->quirks = panfrost_get_quirks(dev->gpu_id); dev->quirks = panfrost_get_quirks(dev->gpu_id);
dev->compressed_formats = panfrost_query_compressed_formats(fd);
util_sparse_array_init(&dev->bo_map, sizeof(struct panfrost_bo), 512); util_sparse_array_init(&dev->bo_map, sizeof(struct panfrost_bo), 512);