From a96d7cdbc05a39de9595678184893d7d830cca48 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sat, 28 Jun 2025 11:23:58 -0700 Subject: [PATCH] venus: drop drm_format_modifier tracking Part-of: --- src/virtio/vulkan/vn_android.c | 1 - src/virtio/vulkan/vn_image.h | 2 -- src/virtio/vulkan/vn_wsi.c | 17 ----------------- 3 files changed, 20 deletions(-) diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index f51c527c8b1..fe36dca767a 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -419,7 +419,6 @@ vn_android_image_from_anb_internal(struct vn_device *dev, img->wsi.is_wsi = true; img->wsi.tiling_override = builder.create.tiling; - img->wsi.drm_format_modifier = builder.modifier.drmFormatModifier; int dma_buf_fd = vn_android_gralloc_get_dma_buf_fd(anb_info->handle); if (dma_buf_fd < 0) { diff --git a/src/virtio/vulkan/vn_image.h b/src/virtio/vulkan/vn_image.h index f524a08000d..be4dcc12777 100644 --- a/src/virtio/vulkan/vn_image.h +++ b/src/virtio/vulkan/vn_image.h @@ -74,8 +74,6 @@ struct vn_image { bool is_wsi; bool is_prime_blit_src; VkImageTiling tiling_override; - /* valid when tiling is VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT */ - uint64_t drm_format_modifier; struct vn_device_memory *memory; diff --git a/src/virtio/vulkan/vn_wsi.c b/src/virtio/vulkan/vn_wsi.c index 79737770dce..6aa3d184f3d 100644 --- a/src/virtio/vulkan/vn_wsi.c +++ b/src/virtio/vulkan/vn_wsi.c @@ -141,23 +141,6 @@ vn_wsi_create_image(struct vn_device *dev, img->wsi.is_prime_blit_src = wsi_info->blit_src; img->wsi.tiling_override = create_info->tiling; - if (create_info->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) { - VkDevice dev_handle = vn_device_to_handle(dev); - VkImage img_handle = vn_image_to_handle(img); - - VkImageDrmFormatModifierPropertiesEXT props = { - .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT, - }; - result = vn_GetImageDrmFormatModifierPropertiesEXT(dev_handle, - img_handle, &props); - if (result != VK_SUCCESS) { - vn_DestroyImage(dev_handle, img_handle, alloc); - return result; - } - - img->wsi.drm_format_modifier = props.drmFormatModifier; - } - *out_img = img; return VK_SUCCESS; }