Skip to content

Commit

Permalink
Revert termux patches for compatibility
Browse files Browse the repository at this point in the history 
This reverts commit 35920c4.
  • Loading branch information
@SolDev69
SolDev69 committed Feb 1, 2024
1 parent 4733025 commit c76f53f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 169 deletions.
17 changes: 0 additions & 17 deletions src/freedreno/vulkan/tu_wsi.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@

#include "tu_device.h"

static void
kgsl_get_info(VkPhysicalDevice _pdevice,
VkDeviceMemory _memory,
int *fd,
uint32_t *offset)
{
TU_FROM_HANDLE(tu_physical_device, pdevice, _pdevice);
TU_FROM_HANDLE(tu_device_memory, memory, _memory);
*fd = pdevice->local_fd;
*offset = memory->bo->gem_handle << 12;
}

static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{
Expand Down Expand Up @@ -57,11 +45,6 @@ tu_wsi_init(struct tu_physical_device *physical_device)
if (result != VK_SUCCESS)
return result;

if (strcmp(physical_device->instance->knl->name, "kgsl") == 0) {
physical_device->wsi_device.kgsl_get_info = kgsl_get_info;
physical_device->wsi_device.is_tu_kgsl = true;
}

physical_device->wsi_device.supports_modifiers = true;
physical_device->wsi_device.can_present_on_device =
tu_wsi_can_present_on_device;
Expand Down
2 changes: 1 addition & 1 deletion src/vulkan/wsi/wsi_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ wsi_common_queue_present(const struct wsi_device *wsi,
assert(!has_signal_dma_buf);
#endif

if (wsi->sw || (wsi->is_tu_kgsl && !has_signal_dma_buf))
if (wsi->sw)
wsi->WaitForFences(device, 1, &swapchain->fences[image_index],
true, ~0ull);

Expand Down
6 changes: 0 additions & 6 deletions src/vulkan/wsi/wsi_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ struct wsi_device {
} win32;

bool sw;
bool is_tu_kgsl;

/* Set to true if the implementation is ok with linear WSI images. */
bool wants_linear;
Expand Down Expand Up @@ -226,11 +225,6 @@ struct wsi_device {
*/
VkQueue (*get_blit_queue)(VkDevice device);

void (*kgsl_get_info)(VkPhysicalDevice _pdevice,
VkDeviceMemory _memory,
int *fd,
uint32_t *offset);

#define WSI_CB(cb) PFN_vk##cb cb
WSI_CB(AllocateMemory);
WSI_CB(AllocateCommandBuffers);
Expand Down
119 changes: 1 addition & 118 deletions src/vulkan/wsi/wsi_common_drm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <xf86drm.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>

static VkResult
wsi_dma_buf_export_sync_file(int dma_buf_fd, int *sync_file_fd)
Expand Down Expand Up @@ -107,9 +104,6 @@ prepare_signal_dma_buf_from_semaphore(struct wsi_swapchain *chain,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT))
return VK_ERROR_FEATURE_NOT_PRESENT;

if (chain->wsi->is_tu_kgsl)
return VK_ERROR_FEATURE_NOT_PRESENT;

int sync_file_fd = -1;
result = wsi_dma_buf_export_sync_file(image->dma_buf_fd, &sync_file_fd);
if (result != VK_SUCCESS)
Expand Down Expand Up @@ -208,9 +202,6 @@ wsi_create_sync_for_dma_buf_wait(const struct wsi_swapchain *chain,
if (sync_type == NULL)
return VK_ERROR_FEATURE_NOT_PRESENT;

if (chain->wsi->is_tu_kgsl)
return VK_ERROR_FEATURE_NOT_PRESENT;

int sync_file_fd = -1;
result = wsi_dma_buf_export_sync_file(image->dma_buf_fd, &sync_file_fd);
if (result != VK_SUCCESS)
Expand Down Expand Up @@ -315,11 +306,6 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
const struct wsi_image_info *info,
struct wsi_image *image);

static VkResult
wsi_create_kgsl_image_mem(const struct wsi_swapchain *chain,
const struct wsi_image_info *info,
struct wsi_image *image);

static VkResult
wsi_configure_native_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
Expand Down Expand Up @@ -458,10 +444,7 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
}
}

if (wsi->is_tu_kgsl)
info->create_mem = wsi_create_kgsl_image_mem;
else
info->create_mem = wsi_create_native_image_mem;
info->create_mem = wsi_create_native_image_mem;

return VK_SUCCESS;

Expand Down Expand Up @@ -580,106 +563,6 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
return VK_SUCCESS;
}

static int ion_alloc(uint64_t size) {
int fd = -1, ion_dev = open("/dev/ion", O_RDONLY);
if (ion_dev < 0)
goto fail_open;
struct ion_allocation_data {
__u64 len;
__u32 heap_id_mask;
__u32 flags;
__u32 fd;
__u32 unused;
} alloc_data = {
.len = size,
/* ION_HEAP_SYSTEM | ION_SYSTEM_HEAP_ID */
.heap_id_mask = (1U << 0) | (1U << 25),
.flags = 0, /* uncached */
};
if (ioctl(ion_dev, _IOWR('I', 0, struct ion_allocation_data), &alloc_data) <
0)
goto fail_alloc;
fd = alloc_data.fd;
fail_alloc:
close(ion_dev);
fail_open:
return fd;
};

static VkResult
wsi_create_kgsl_image_mem(const struct wsi_swapchain *chain,
const struct wsi_image_info *info,
struct wsi_image *image)
{
const struct wsi_device *wsi = chain->wsi;
VkResult result;

VkMemoryRequirements reqs;
wsi->GetImageMemoryRequirements(chain->device, image->image, &reqs);

if (debug_get_bool_option("USE_HEAP", false)) {
image->dma_buf_fd = ion_alloc(reqs.size);
}

const struct wsi_memory_allocate_info memory_wsi_info = {
.sType = VK_STRUCTURE_TYPE_WSI_MEMORY_ALLOCATE_INFO_MESA,
.pNext = NULL,
.implicit_sync = true,
};
const VkImportMemoryFdInfoKHR memory_import_info = {
.sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
.pNext = &memory_wsi_info,
.fd = os_dupfd_cloexec(image->dma_buf_fd),
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT
};
const VkMemoryDedicatedAllocateInfo memory_dedicated_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
.pNext = (image->dma_buf_fd != -1) ? &memory_import_info : &memory_wsi_info,
.image = image->image,
.buffer = VK_NULL_HANDLE,
};
const VkMemoryAllocateInfo memory_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = &memory_dedicated_info,
.allocationSize = reqs.size,
.memoryTypeIndex =
wsi_select_device_memory_type(wsi, reqs.memoryTypeBits),
};
result = wsi->AllocateMemory(chain->device, &memory_info,
&chain->alloc, &image->memory);
if (result != VK_SUCCESS)
return result;

uint32_t dma_buf_offset = 0;
if (image->dma_buf_fd == -1)
wsi->kgsl_get_info(wsi->pdevice, image->memory, &image->dma_buf_fd,
&dma_buf_offset);

image->cpu_map = mmap(0, reqs.size, PROT_READ | PROT_WRITE, MAP_SHARED,
image->dma_buf_fd, dma_buf_offset);

if (image->cpu_map == MAP_FAILED)
return VK_ERROR_OUT_OF_HOST_MEMORY;
munmap(image->cpu_map, reqs.size);

const VkImageSubresource image_subresource = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.mipLevel = 0,
.arrayLayer = 0,
};
VkSubresourceLayout image_layout;
wsi->GetImageSubresourceLayout(chain->device, image->image,
&image_subresource, &image_layout);

image->drm_modifier = 1274; /* termux-x11's RAW_MMAPPABLE_FD */
image->num_planes = 1;
image->sizes[0] = reqs.size;
image->row_pitches[0] = image_layout.rowPitch;
image->offsets[0] = dma_buf_offset;

return VK_SUCCESS;
}

#define WSI_PRIME_LINEAR_STRIDE_ALIGN 256

static VkResult
Expand Down
58 changes: 31 additions & 27 deletions src/vulkan/wsi/wsi_common_x11.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ x11_acquire_next_image_poll_find_index(struct x11_swapchain *chain, uint32_t *im
for (uint32_t i = 0; i < chain->base.image_count; i++) {
if (!chain->images[i].busy) {
/* We found a non-busy image */
xcb_sync_await_fence(chain->conn, 1, &chain->images[i].sync_fence);
xshmfence_await(chain->images[i].shm_fence);
*image_index = i;
chain->images[i].busy = true;
chain->present_poll_acquire_count++;
Expand Down Expand Up @@ -1573,7 +1573,7 @@ x11_acquire_next_image_from_queue(struct x11_swapchain *chain,
}

assert(image_index < chain->base.image_count);
xcb_sync_await_fence(chain->conn, 1, &chain->images[image_index].sync_fence);
xshmfence_await(chain->images[image_index].shm_fence);

*image_index_out = image_index;

Expand Down Expand Up @@ -1616,7 +1616,7 @@ x11_present_to_x11_dri3(struct x11_swapchain *chain, uint32_t image_index,
options |= XCB_PRESENT_OPTION_SUBOPTIMAL;
#endif

xcb_sync_reset_fence(chain->conn, image->sync_fence);
xshmfence_reset(image->shm_fence);

++chain->sent_image_count;
assert(chain->sent_image_count <= chain->base.image_count);
Expand Down Expand Up @@ -2195,23 +2195,15 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain,
if (fd == -1)
return VK_ERROR_OUT_OF_HOST_MEMORY;

cookie = xcb_dri3_pixmap_from_buffers_checked(chain->conn,
image->pixmap,
chain->window,
image->base.num_planes,
pCreateInfo->imageExtent.width,
pCreateInfo->imageExtent.height,
image->base.row_pitches[0],
image->base.offsets[0],
0,
0,
0,
0,
0,
0,
chain->depth, bpp,
image->base.drm_modifier,
&fd);
cookie =
xcb_dri3_pixmap_from_buffer_checked(chain->conn,
image->pixmap,
chain->window,
image->base.sizes[0],
pCreateInfo->imageExtent.width,
pCreateInfo->imageExtent.height,
image->base.row_pitches[0],
chain->depth, bpp, fd);
}

error = xcb_request_check(chain->conn, cookie);
Expand All @@ -2221,18 +2213,29 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain,
}

out_fence:
image->sync_fence = xcb_generate_id(chain->conn);
cookie = xcb_sync_create_fence_checked(chain->conn, image->pixmap, image->sync_fence, false);
xcb_generic_error_t *err = xcb_request_check(chain->conn, cookie);
if (err != NULL) {
free(err);
fence_fd = xshmfence_alloc_shm();
if (fence_fd < 0)
goto fail_pixmap;
}

image->shm_fence = xshmfence_map_shm(fence_fd);
if (image->shm_fence == NULL)
goto fail_shmfence_alloc;

image->sync_fence = xcb_generate_id(chain->conn);
xcb_dri3_fence_from_fd(chain->conn,
image->pixmap,
image->sync_fence,
false,
fence_fd);

image->busy = false;
xcb_sync_trigger_fence(chain->conn, image->sync_fence);
xshmfence_trigger(image->shm_fence);

return VK_SUCCESS;

fail_shmfence_alloc:
close(fence_fd);

fail_pixmap:
cookie = xcb_free_pixmap(chain->conn, image->pixmap);
xcb_discard_reply(chain->conn, cookie.sequence);
Expand All @@ -2253,6 +2256,7 @@ x11_image_finish(struct x11_swapchain *chain,
if (!chain->base.wsi->sw || chain->has_mit_shm) {
cookie = xcb_sync_destroy_fence(chain->conn, image->sync_fence);
xcb_discard_reply(chain->conn, cookie.sequence);
xshmfence_unmap_shm(image->shm_fence);

cookie = xcb_free_pixmap(chain->conn, image->pixmap);
xcb_discard_reply(chain->conn, cookie.sequence);
Expand Down

0 comments on commit c76f53f

Please sign in to comment.