KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan/wsi: Implement VK_EXT_acquire_drm_display 

Implements the two functions defined in the extension
VK_EXT_acquire_drm_display, vkAcquireDrmDisplayEXT and vkGetDrmDisplayEXT.

Signed-off-by: Simon Zeni <simon@bl4ckb0ne.ca>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11014>
This commit is contained in:
Simon Zeni 2021-06-21 11:55:14 -04:00 committed by Marge Bot
parent fdf22aad73
commit f9944899a7
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/vulkan/wsi/wsi_common_display.c
View File

@ -2603,3 +2603,56 @@ wsi_get_swapchain_counter(VkDevice device,
return VK_SUCCESS;
}
VkResult
wsi_acquire_drm_display(VkPhysicalDevice pDevice,
struct wsi_device *wsi_device,
int drm_fd,
VkDisplayKHR display)
{
if (!wsi_device_matches_drm_fd(wsi_device, drm_fd))
return VK_ERROR_UNKNOWN;
struct wsi_display *wsi =
(struct wsi_display *) wsi_device->wsi[VK_ICD_WSI_PLATFORM_DISPLAY];
/* XXX no support for mulitple leases yet */
if (wsi->fd >= 0 || !local_drmIsMaster(drm_fd))
return VK_ERROR_INITIALIZATION_FAILED;
struct wsi_display_connector *connector =
wsi_display_connector_from_handle(display);
drmModeConnectorPtr drm_connector =
drmModeGetConnectorCurrent(drm_fd, connector->id);
if (!drm_connector)
return VK_ERROR_INITIALIZATION_FAILED;
drmModeFreeConnector(drm_connector);
wsi->fd = drm_fd;
return VK_SUCCESS;
}
VkResult
wsi_get_drm_display(VkPhysicalDevice pDevice,
struct wsi_device *wsi_device,
int drm_fd,
int connector_id,
VkDisplayKHR *display)
{
if (!wsi_device_matches_drm_fd(wsi_device, drm_fd))
return VK_ERROR_UNKNOWN;
struct wsi_display_connector *connector =
wsi_display_get_connector(wsi_device, drm_fd, connector_id);
if (!connector) {
*display = VK_NULL_HANDLE;
return VK_ERROR_UNKNOWN;
}
*display = wsi_display_connector_to_handle(connector);
return VK_SUCCESS;
}

14
src/vulkan/wsi/wsi_common_display.h
View File

@ -157,4 +157,18 @@ wsi_get_swapchain_counter(VkDevice device,
VkSurfaceCounterFlagBitsEXT flag_bits,
uint64_t *value);
/* VK_EXT_acquire_drm_display */
VkResult
wsi_acquire_drm_display(VkPhysicalDevice pDevice,
struct wsi_device *wsi_device,
int drmFd,
VkDisplayKHR display);
VkResult
wsi_get_drm_display(VkPhysicalDevice pDevice,
struct wsi_device *wsi_device,
int drmFd,
int connectorId,
VkDisplayKHR *display);
#endif