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

gfxstream: fix virtio-gpu on Goldfish interactions

Browse source 
So Goldfish doesn't really have /dev/dri/renderN128
in it's system image, but somehow this worked in the
past?

Probably since VirtGpuDevice::getInstance() never
returned a nullptr in the past, and now it does.

Add nullptr checks to fix the crash.

TEST=emulator -feature GuestAngle -gpu lavapipe boots
     to UI on main

Reviewed-by: Marcin Radomski <dextero@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35580>
This commit is contained in:
Gurchetan Singh 2025-06-16 17:53:31 -07:00 • committed by Marge Bot
parent 5090aa7160
commit 1d62d989a1
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
View file

@ -1407,7 +1407,9 @@ bool ResourceTracker::isValidMemoryRange(const VkMappedMemoryRange& range) {
void ResourceTracker::setupCaps(uint32_t& noRenderControlEnc) {
VirtGpuDevice* instance = VirtGpuDevice::getInstance(kCapsetGfxStreamVulkan);
mCaps = instance->getCaps();
if (instance) {
mCaps = instance->getCaps();
}
// Delete once goldfish Linux drivers are gone
if (mCaps.vulkanCapset.protocolVersion == 0) {
@ -1501,7 +1503,7 @@ void ResourceTracker::setupFeatures(const struct GfxStreamVkFeatureInfo* feature
void ResourceTracker::setupPlatformHelpers() {
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
VirtGpuDevice* instance = VirtGpuDevice::getInstance(kCapsetGfxStreamVulkan);
auto deviceHandle = instance->getDeviceHandle();
auto deviceHandle = instance ? instance->getDeviceHandle() : INVALID_DESCRIPTOR;
if (mGralloc == nullptr) {
mGralloc.reset(gfxstream::createPlatformGralloc(deviceHandle));
}
@ -2152,12 +2154,13 @@ void ResourceTracker::on_vkGetPhysicalDeviceProperties2(void* context,
VkPhysicalDeviceProperties2* pProperties) {
if (pProperties) {
on_vkGetPhysicalDeviceProperties(context, physicalDevice, &pProperties->properties);
VirtGpuDevice* instance = VirtGpuDevice::getInstance();
VkPhysicalDeviceDrmPropertiesEXT* drmProps =
vk_find_struct(pProperties, PHYSICAL_DEVICE_DRM_PROPERTIES_EXT);
if (drmProps) {
if (instance && drmProps) {
VirtGpuDrmInfo drmInfo;
if (VirtGpuDevice::getInstance()->getDrmInfo(&drmInfo)) {
if (instance->getDrmInfo(&drmInfo)) {
drmProps->hasPrimary = drmInfo.hasPrimary;
drmProps->hasRender = drmInfo.hasRender;
drmProps->primaryMajor = drmInfo.primaryMajor;
@ -2174,9 +2177,9 @@ void ResourceTracker::on_vkGetPhysicalDeviceProperties2(void* context,
VkPhysicalDevicePCIBusInfoPropertiesEXT* pciBusInfoProps =
vk_find_struct(pProperties, PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT);
if (pciBusInfoProps) {
if (instance && pciBusInfoProps) {
VirtGpuPciBusInfo pciBusInfo;
if (VirtGpuDevice::getInstance()->getPciBusInfo(&pciBusInfo)) {
if (instance->getPciBusInfo(&pciBusInfo)) {
pciBusInfoProps->pciDomain = pciBusInfo.domain;
pciBusInfoProps->pciBus = pciBusInfo.bus;
pciBusInfoProps->pciDevice = pciBusInfo.device;

2
src/gfxstream/guest/vulkan_enc/ResourceTracker.h
View file

@ -980,7 +980,7 @@ class ResourceTracker {
std::unique_ptr<gfxstream::SyncHelper> mSyncHelper = nullptr;
struct VirtGpuCaps mCaps;
struct VirtGpuCaps mCaps = {};
std::vector<VkExtensionProperties> mHostInstanceExtensions;
std::vector<VkExtensionProperties> mHostDeviceExtensions;