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

venus: lazily query and cache gralloc front rendering usage

Browse source 
When skiavk is the default system ui renderer, venus icd gets preloaded
into Zygote. However, Zygote access to render node is normally denied by
selinux except for legacy bootanimation purpose. This change fixes venus
icd loading to avoid invoking cros gralloc driver loading by moving the
perform op outside, so that we still get the memory footprint win.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21107>
This commit is contained in:
Yiwei Zhang 2023-02-03 10:29:16 +00:00 • committed by Marge Bot
parent de5b67ef2c
commit 86c6484fba
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/virtio/vulkan/vn_android.c
View file

@ -42,9 +42,13 @@ static struct vn_android_gralloc _vn_android_gralloc;
static int
vn_android_gralloc_init()
{
/* We preload same-process gralloc hw module along with venus icd. When
* venus gets preloaded in Zygote, the unspecialized Zygote process
* defaults to no access to dri nodes. So we MUST NOT invoke any gralloc
* helpers here to avoid initializing cros gralloc driver.
*/
static const char CROS_GRALLOC_MODULE_NAME[] = "CrOS Gralloc";
const gralloc_module_t *gralloc = NULL;
uint32_t front_rendering_usage = 0;
int ret;
/* get gralloc module for gralloc buffer info query */
@ -61,19 +65,13 @@ vn_android_gralloc_init()
return -1;
}
/* check the helper without using it here as mentioned above */
if (!gralloc->perform) {
dlclose(gralloc->common.dso);
vn_log(NULL, "missing required gralloc helper: perform");
return -1;
}
if (gralloc->perform(gralloc, CROS_GRALLOC_DRM_GET_USAGE,
CROS_GRALLOC_DRM_GET_USAGE_FRONT_RENDERING_BIT,
&front_rendering_usage) == 0) {
assert(front_rendering_usage);
_vn_android_gralloc.front_rendering_usage = front_rendering_usage;
}
_vn_android_gralloc.module = gralloc;
return 0;
@ -85,9 +83,24 @@ vn_android_gralloc_fini()
dlclose(_vn_android_gralloc.module->common.dso);
}
static void
vn_android_gralloc_shared_present_usage_init_once()
{
const gralloc_module_t *gralloc = _vn_android_gralloc.module;
uint32_t front_rendering_usage = 0;
if (gralloc->perform(gralloc, CROS_GRALLOC_DRM_GET_USAGE,
CROS_GRALLOC_DRM_GET_USAGE_FRONT_RENDERING_BIT,
&front_rendering_usage) == 0) {
assert(front_rendering_usage);
_vn_android_gralloc.front_rendering_usage = front_rendering_usage;
}
}
uint32_t
vn_android_gralloc_get_shared_present_usage()
{
static once_flag once = ONCE_FLAG_INIT;
call_once(&once, vn_android_gralloc_shared_present_usage_init_once);
return _vn_android_gralloc.front_rendering_usage;
}