<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Mar 7, 2018 at 11:25 PM, Keith Packard <<a href="mailto:keithp@keithp.com" target="_blank">keithp@keithp.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This adds support for the KHR_display extension to the anv Vulkan driver. The driver now attempts to open the master DRM node when the KHR_display extension is requested so that the common winsys code can perform the necessary operations. v2: Make sure primary fd is usable Â Â Â Â When KHR_display is selected, we try to open the primary node Â Â Â Â instead of the render node in case the user wants to use Â Â Â Â KHR_display for presentation. However, if we're actually going Â Â Â Â to end up using RandR leases, then we don't care if the Â Â Â Â resulting fd can't be used for display, but the kernel also Â Â Â Â prevents us from using it for drawing when someone else has Â Â Â Â master. v3: Â Â Â Â Simplify addition of VK_USE_PLATFORM_DISPLAY_KHR to vulkan_wsi_args Â Â Â Â Suggested-by: Eric Engestrom <<a href="mailto:eric.engestrom@imgtec.com">eric.engestrom@imgtec.com</a>> v4: Â Â Â Â Adapt primary node usage to new wsi_device_init API Signed-off-by: Keith Packard <<a href="mailto:keithp@keithp.com">keithp@keithp.com</a>> --- Â src/intel/Makefile.sourcesÂ Â Â Â Â Â Â |Â Â 3 + Â src/intel/<a href="http://Makefile.vulkan.am" rel="noreferrer" target="_blank">Makefile.vulkan.am</a>Â Â Â Â Â Â |Â Â 7 ++ Â src/intel/vulkan/anv_device.cÂ Â Â Â Â |Â 21 ++++++ Â src/intel/vulkan/anv_extensions.pyÂ Â Â |Â Â 1 + Â src/intel/vulkan/anv_extensions_gen.py |Â Â 5 +- Â src/intel/vulkan/anv_wsi_display.cÂ Â Â | 129 +++++++++++++++++++++++++++++++++ Â src/intel/vulkan/meson.buildÂ Â Â Â Â Â |Â Â 5 ++ Â 7 files changed, 169 insertions(+), 2 deletions(-) Â create mode 100644 src/intel/vulkan/anv_wsi_display.c diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 91c71a8dfaf..6c6b57c603d 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -250,6 +250,9 @@ VULKAN_WSI_WAYLAND_FILES := \ Â VULKAN_WSI_X11_FILES := \ Â Â Â Â vulkan/anv_wsi_x11.c +VULKAN_WSI_DISPLAY_FILES := \ +Â Â Â Â vulkan/anv_wsi_display.c + Â VULKAN_GEM_FILES := \ Â Â Â Â vulkan/anv_gem.c diff --git a/src/intel/<a href="http://Makefile.vulkan.am" rel="noreferrer" target="_blank">Makefile.vulkan.am</a> b/src/intel/<a href="http://Makefile.vulkan.am" rel="noreferrer" target="_blank">Makefile.vulkan.am</a> index 6b71df6319a..9b6b68abef9 100644 --- a/src/intel/<a href="http://Makefile.vulkan.am" rel="noreferrer" target="_blank">Makefile.vulkan.am</a> +++ b/src/intel/<a href="http://Makefile.vulkan.am" rel="noreferrer" target="_blank">Makefile.vulkan.am</a> @@ -193,6 +193,13 @@ VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) Â VULKAN_LIB_DEPS += $(WAYLAND_CLIENT_LIBS) Â endif +if HAVE_PLATFORM_DISPLAY +VULKAN_CPPFLAGS += \ +Â Â Â Â -DVK_USE_PLATFORM_DISPLAY_KHR + +VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES) +endif + Â noinst_LTLIBRARIES += vulkan/<a href="http://libvulkan_common.la" rel="noreferrer" target="_blank">libvulkan_common.la</a> Â vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) Â vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index ab61e0ce339..de1d5af2137 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -278,6 +278,7 @@ anv_physical_device_init_uuids(struct anv_physical_device *device) Â static VkResult Â anv_physical_device_init(struct anv_physical_device *device, Â Â Â Â Â Â Â Â Â Â Â Â Â struct anv_instance *instance, +Â Â Â Â Â Â Â Â Â Â Â Â Â const char *primary_path, Â Â Â Â Â Â Â Â Â Â Â Â Â const char *path) Â { Â Â VkResult result; @@ -444,6 +445,25 @@ anv_physical_device_init(struct anv_physical_device *device, Â Â anv_physical_device_get_supported_extensions(device, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &device->supported_extensions); +Â Â if (instance->enabled_extensions.KHR_display) { +Â Â Â master_fd = open(path, O_RDWR | O_CLOEXEC); +Â Â Â if (master_fd >= 0) { +Â Â Â Â Â /* prod the device with a GETPARAM call which will fail if +Â Â Â Â Â * we don't have permission to even render on this device +Â Â Â Â Â */ +Â Â Â Â Â drm_i915_getparam_t gp; +Â Â Â Â Â memset(&gp, '\0', sizeof(gp)); +Â Â Â Â Â int devid = 0; +Â Â Â Â Â gp.param = I915_PARAM_CHIPSET_ID; +Â Â Â Â Â gp.value = &devid; +Â Â Â Â Â int ret = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); +Â Â Â Â Â if (ret < 0) { +Â Â Â Â Â Â close(master_fd); +Â Â Â Â Â Â master_fd = -1; +Â Â Â Â Â } +Â Â Â } +Â Â } + Â Â device->local_fd = fd; Â Â device->master_fd = master_fd; Â Â return VK_SUCCESS; @@ -641,6 +661,7 @@ anv_enumerate_devices(struct anv_instance *instance) Â Â Â Â Â result = anv_physical_device_init(&instance->physicalDevice, Â Â Â Â Â Â Â Â Â Â Â Â Â instance, +Â Â Â Â Â Â Â Â Â Â Â Â devices[i]->nodes[DRM_NODE_PRIMARY], Â Â Â Â Â Â Â Â Â Â Â Â Â devices[i]->nodes[DRM_NODE_RENDER]); Â Â Â Â Â if (result != VK_ERROR_INCOMPATIBLE_DRIVER) Â Â Â Â Â Â Â break; diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index d0b70a04055..c23c0a87bb9 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -107,6 +107,7 @@ EXTENSIONS = [ Â Â Â Extension('VK_KHR_xcb_surface',Â Â Â Â Â Â Â Â Â Â Â Â 6, 'VK_USE_PLATFORM_XCB_KHR'), Â Â Â Extension('VK_KHR_xlib_surface',Â Â Â Â Â Â Â Â Â Â Â 6, 'VK_USE_PLATFORM_XLIB_KHR'), Â Â Â Extension('VK_KHR_multiview',Â Â Â Â Â Â Â Â Â Â Â Â Â 1, True), +Â Â Extension('VK_KHR_display',Â Â Â Â Â Â Â Â Â Â Â Â Â 23, 'VK_USE_PLATFORM_DISPLAY_KHR'), Â Â Â Extension('VK_EXT_debug_report',Â Â Â Â Â Â Â Â Â Â Â 8, True), Â Â Â Extension('VK_EXT_external_memory_dma_buf',Â Â Â Â Â Â 1, True), Â Â Â Extension('VK_EXT_global_priority',Â Â Â Â Â Â Â Â Â Â 1, diff --git a/src/intel/vulkan/anv_extensions_gen.py b/src/intel/vulkan/anv_extensions_gen.py index 9bcb631b124..180e6842357 100644 --- a/src/intel/vulkan/anv_extensions_gen.py +++ b/src/intel/vulkan/anv_extensions_gen.py @@ -113,7 +113,7 @@ _TEMPLATE_C = Template(COPYRIGHT + """ Â #include "vk_util.h" Â /* Convert the VK_USE_PLATFORM_* defines to booleans */ -%for platform in ['ANDROID', 'WAYLAND', 'XCB', 'XLIB']: +%for platform in ['ANDROID', 'WAYLAND', 'XCB', 'XLIB', 'DISPLAY']: Â #ifdef VK_USE_PLATFORM_${platform}_KHR Â #Â Â undef VK_USE_PLATFORM_${platform}_KHR Â #Â Â define VK_USE_PLATFORM_${platform}_KHR true @@ -132,7 +132,8 @@ _TEMPLATE_C = Template(COPYRIGHT + """ Â #define ANV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\ Â Â Â Â Â Â Â Â Â Â Â Â Â VK_USE_PLATFORM_XCB_KHR || \\ -Â Â Â Â Â Â Â Â Â Â Â Â Â VK_USE_PLATFORM_XLIB_KHR) +Â Â Â Â Â Â Â Â Â Â Â Â Â VK_USE_PLATFORM_XLIB_KHR || \\ +Â Â Â Â Â Â Â Â Â Â Â Â Â VK_USE_PLATFORM_DISPLAY_KHR) Â static const uint32_t MAX_API_VERSION = ${MAX_API_VERSION.c_vk_version()}; diff --git a/src/intel/vulkan/anv_wsi_display.c b/src/intel/vulkan/anv_wsi_display.c new file mode 100644 index 00000000000..9b00d7f02e4 --- /dev/null +++ b/src/intel/vulkan/anv_wsi_display.c @@ -0,0 +1,129 @@ +/* + * Copyright Â© 2017 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission.Â The copyright holders make no representations + * about the suitability of this software for any purpose.Â It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include "anv_private.h" +#include "wsi_common.h" +#include "vk_format_info.h" +#include "vk_util.h" +#include "wsi_common_display.h" + +#define MM_PER_PIXELÂ Â Â (1.0/96.0 * 25.4) </blockquote><div> </div><div>I don't think you need this. :-) </div><div>Other than that and the comment on patch 1 about stuff that should probably go here, this looks good to me. </div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +VkResult +anv_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â *property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayPropertiesKHRÂ Â Â Â *properties) +{ +Â Â ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device); + +Â Â return wsi_display_get_physical_device_display_properties(physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pdevice->wsi_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â properties); +} + +VkResult +anv_GetPhysicalDeviceDisplayPlanePropertiesKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â Â *property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayPlanePropertiesKHRÂ Â Â *properties) +{ +Â Â ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device); + +Â Â return wsi_display_get_physical_device_display_plane_properties(physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pdevice->wsi_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â properties); +} + +VkResult +anv_GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â Â plane_index, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â Â *display_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayKHRÂ Â Â Â Â Â Â Â Â Â *displays) +{ +Â Â ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device); + +Â Â return wsi_display_get_display_plane_supported_displays(physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pdevice->wsi_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â plane_index, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â display_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â displays); +} + + +VkResult +anv_GetDisplayModePropertiesKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayKHRÂ Â Â Â Â Â Â Â Â Â display, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â Â *property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayModePropertiesKHRÂ Â Â *properties) +{ +Â Â ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device); + +Â Â return wsi_display_get_display_mode_properties(physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pdevice->wsi_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â display, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â property_count, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â properties); +} + +VkResult +anv_CreateDisplayModeKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayKHRÂ Â Â Â Â Â Â Â Â Â Â Â Â display, +Â Â Â Â Â Â Â Â Â Â Â Â Â const VkDisplayModeCreateInfoKHRÂ Â Â *create_info, +Â Â Â Â Â Â Â Â Â Â Â Â Â const VkAllocationCallbacksÂ Â Â Â Â Â *allocator, +Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayModeKHRÂ Â Â Â Â Â Â Â Â Â Â *mode) +{ +Â Â return VK_ERROR_INITIALIZATION_FAILED; </blockquote><div> </div><div>This looks valid though it might be nice to allow adding modes at some point. </div><div>--Jason </div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +} + + +VkResult +anv_GetDisplayPlaneCapabilitiesKHR(VkPhysicalDeviceÂ Â Â Â Â Â Â Â Â Â physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayModeKHRÂ Â Â Â Â Â Â Â Â Â mode_khr, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â Â Â Â plane_index, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkDisplayPlaneCapabilitiesKHRÂ Â Â Â *capabilities) +{ +Â Â ANV_FROM_HANDLE(anv_physical_device, pdevice, physical_device); + +Â Â return wsi_get_display_plane_capabilities(physical_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &pdevice->wsi_device, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â mode_khr, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â plane_index, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â capabilities); +} + +VkResult +anv_CreateDisplayPlaneSurfaceKHR(VkInstanceÂ Â Â Â Â Â Â Â Â Â Â Â Â Â _instance, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â const VkDisplaySurfaceCreateInfoKHRÂ Â *create_info, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â const VkAllocationCallbacksÂ Â Â Â Â Â *allocator, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VkSurfaceKHRÂ Â Â Â Â Â Â Â Â Â Â Â Â *surface) +{ +Â Â ANV_FROM_HANDLE(anv_instance, instance, _instance); +Â Â const VkAllocationCallbacks *alloc; + +Â Â if (allocator) +Â Â Â alloc = allocator; +Â Â else +Â Â Â alloc = &instance->alloc; + +Â Â return wsi_create_display_surface(_instance, alloc, create_info, surface); +} diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index ef50134636e..870d0a5a6c4 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -173,6 +173,11 @@ if with_platform_wayland Â Â libanv_files += files('anv_wsi_wayland.c') Â endif +if with_platform_display +Â anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR' +Â libanv_files += files('anv_wsi_display.c') +endif + Â libanv_common = static_library( Â Â 'anv_common', Â Â [libanv_files, anv_entrypoints, anv_extensions_c, anv_extensions_h], -- 2.16.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>