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

venus: Delete vn_renderer_info::has_cache_management

Browse Source 
It has been false since commit 247232d596, when Venus was merged
upstream in April 2021.

Signed-off-by: Lina Versace <linyaa@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22099>
This commit is contained in:
Lina Versace
2023-03-23 13:57:07 -07:00
committed by Marge Bot
parent e58352930e
commit 436a0d2609
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/virtio/vulkan/vn_physical_device.c
View File

@@ -778,19 +778,21 @@ vn_physical_device_init_memory_properties(
instance, vn_physical_device_to_handle(physical_dev), instance, vn_physical_device_to_handle(physical_dev),
&physical_dev->memory_properties); &physical_dev->memory_properties);
if (!instance->renderer->info.has_cache_management) { VkPhysicalDeviceMemoryProperties *props =
VkPhysicalDeviceMemoryProperties *props = &physical_dev->memory_properties.memoryProperties;
&physical_dev->memory_properties.memoryProperties; const uint32_t host_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
const uint32_t host_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
for (uint32_t i = 0; i < props->memoryTypeCount; i++) { for (uint32_t i = 0; i < props->memoryTypeCount; i++) {
const bool coherent = props->memoryTypes[i].propertyFlags & /* Kernel makes every mapping coherent. If a memory type is truly
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; * incoherent, it's better to remove the host-visible flag than silently
if (!coherent) * making it coherent.
props->memoryTypes[i].propertyFlags &= ~host_flags; */
} const bool coherent = props->memoryTypes[i].propertyFlags &
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
if (!coherent)
props->memoryTypes[i].propertyFlags &= ~host_flags;
} }
} }

1
src/virtio/vulkan/vn_renderer.h
View File

@@ -62,7 +62,6 @@ struct vn_renderer_info {
} pci; } pci;
bool has_dma_buf_import; bool has_dma_buf_import;
bool has_cache_management;
bool has_external_sync; bool has_external_sync;
bool has_implicit_fencing; bool has_implicit_fencing;
bool has_guest_vram; bool has_guest_vram;

4
src/virtio/vulkan/vn_renderer_virtgpu.c
View File

@@ -1375,10 +1375,6 @@ virtgpu_init_renderer_info(struct virtgpu *gpu)
} }
info->has_dma_buf_import = true; info->has_dma_buf_import = true;
/* Kernel makes every mapping coherent. We are better off filtering
* incoherent memory types out than silently making them coherent.
*/
info->has_cache_management = false;
/* TODO drm_syncobj */ /* TODO drm_syncobj */
info->has_external_sync = false; info->has_external_sync = false;

1
src/virtio/vulkan/vn_renderer_vtest.c
View File

@@ -938,7 +938,6 @@ vtest_init_renderer_info(struct vtest *vtest)
info->pci.device_id = VTEST_PCI_DEVICE_ID; info->pci.device_id = VTEST_PCI_DEVICE_ID;
info->has_dma_buf_import = false; info->has_dma_buf_import = false;
info->has_cache_management = false;
info->has_external_sync = false; info->has_external_sync = false;
info->has_implicit_fencing = false; info->has_implicit_fencing = false;