From d04982125a04962ca4a6d9829b0cdad5793db324 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Mon, 16 Jan 2023 15:45:59 +0200 Subject: [PATCH] Initial DRI3 support --- unix/xserver/hw/vnc/Makefile.am | 9 +- unix/xserver/hw/vnc/Xvnc.man | 9 + unix/xserver/hw/vnc/dri3.c | 284 ++++++++++++++++++++++++++++++++ unix/xserver/hw/vnc/xvnc.c | 45 +++++ unix/xserver120.patch | 11 ++ 5 files changed, 356 insertions(+), 2 deletions(-) create mode 100644 unix/xserver/hw/vnc/dri3.c diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index 4a4958e..0a2f93d 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -30,10 +30,14 @@ bin_PROGRAMS = Xvnc man1_MANS = Xvnc.man -Xvnc_SOURCES = xvnc.c \ +Xvnc_SOURCES = xvnc.c dri3.c \ $(top_srcdir)/Xi/stubs.c $(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/fb/fbcmap_mi.c buildtime.c +if DRI3 +XVNC_SYS_LIBS += -lgbm +endif + # Xvnc contains no C++ sources so automake doesn't understand that we # need to use the C++ compiler to link things. This is the upstream # recommendation for coaxing automake. @@ -44,7 +48,8 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DKASMVNC -DNO_MODULE_EXTS \ -DXVNCEXTRAVERSION="\".$(KASMVNC_COMMIT_ID)\"" \ -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(KASMVNC_SRCDIR)/common -I$(KASMVNC_SRCDIR)/unix/common \ - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ + -I$(top_srcdir)/dri3 @LIBDRM_CFLAGS@ Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -lwebp -lssl -lcrypto -lcrypt diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man index 16ba11d..a82f8e5 100644 --- a/unix/xserver/hw/vnc/Xvnc.man +++ b/unix/xserver/hw/vnc/Xvnc.man @@ -281,6 +281,15 @@ be either \fB0\fP (off), \fB1\fP (always) or \fB2\fP (auto). Default is \fB2\fP. . .TP +.B \-hw3d +Enable hardware 3d acceleration. Default is software (llvmpipe usually). +. +.TP +.B \-drinode \fIpath\fP +Use another path instead of /dev/dri/renderD128. You may need this if you have +more than one GPU. +. +.TP .B \-ZlibLevel \fIlevel\fP Zlib compression level for ZRLE encoding (it does not affect Tight encoding). Acceptable values are between 0 and 9. Default is to use the standard diff --git a/unix/xserver/hw/vnc/dri3.c b/unix/xserver/hw/vnc/dri3.c new file mode 100644 index 0000000..e758915 --- /dev/null +++ b/unix/xserver/hw/vnc/dri3.c @@ -0,0 +1,284 @@ +/* Copyright (c) 2023 Kasm + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from the X Consortium. + +*/ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#ifdef DRI3 + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +extern const char *driNode; + +static struct priv_t { + struct gbm_device *gbm; + int fd; +} priv; + +struct gbm_pixmap { + struct gbm_bo *bo; +}; + +typedef struct gbm_pixmap gbm_pixmap; + +static DevPrivateKeyRec dri3_pixmap_private_key; +static struct timeval start; + + + +static int +xvnc_dri3_open_client(ClientPtr client, + ScreenPtr screen, + RRProviderPtr provider, + int *pfd) +{ + int fd = open(driNode, O_RDWR | O_CLOEXEC); + if (fd < 0) + return BadAlloc; + *pfd = fd; + return Success; +} + +static uint32_t +gbm_format_for_depth(CARD8 depth) +{ + switch (depth) { + case 16: + return GBM_FORMAT_RGB565; + case 24: + return GBM_FORMAT_XRGB8888; + case 30: + return GBM_FORMAT_ARGB2101010; + default: + ErrorF("unexpected depth: %d\n", depth); + /* fallthrough */ + case 32: + return GBM_FORMAT_ARGB8888; + } + +} + +static void dri3_pixmap_set_private(PixmapPtr pixmap, gbm_pixmap *gp) +{ + dixSetPrivate(&pixmap->devPrivates, &dri3_pixmap_private_key, gp); +} + +static gbm_pixmap *gbm_pixmap_get(PixmapPtr pixmap) +{ + return dixLookupPrivate(&pixmap->devPrivates, &dri3_pixmap_private_key); +} + +static PixmapPtr +create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, CARD8 depth) +{ + PixmapPtr pixmap; + + gbm_pixmap *gp = calloc(1, sizeof(gbm_pixmap)); + if (!gp) + return NULL; + + pixmap = screen->CreatePixmap(screen, gbm_bo_get_width(bo), gbm_bo_get_height(bo), + depth, CREATE_PIXMAP_USAGE_SCRATCH); + if (!pixmap) + return NULL; + + gp->bo = bo; + dri3_pixmap_set_private(pixmap, gp); + + return pixmap; +} + +static PixmapPtr +xvnc_pixmap_from_fds(ScreenPtr screen, CARD8 num_fds, const int *fds, + CARD16 width, CARD16 height, + const CARD32 *strides, const CARD32 *offsets, + CARD8 depth, CARD8 bpp, uint64_t modifier) +{ + struct gbm_bo *bo = NULL; + PixmapPtr pixmap; + + if (width == 0 || height == 0 || num_fds == 0 || + depth < 15 || bpp != BitsPerPixel(depth) || + strides[0] < width * bpp / 8) + return NULL; + + if (num_fds == 1) { + struct gbm_import_fd_data data; + + data.fd = fds[0]; + data.width = width; + data.height = height; + data.stride = strides[0]; + data.format = gbm_format_for_depth(depth); + bo = gbm_bo_import(priv.gbm, GBM_BO_IMPORT_FD, &data, + GBM_BO_USE_RENDERING); + if (!bo) + return NULL; + } else { + return NULL; + } + + pixmap = create_pixmap_for_bo(screen, bo, depth); + if (pixmap == NULL) { + gbm_bo_destroy(bo); + return NULL; + } + + return pixmap; +} + +static int +xvnc_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, + uint32_t *strides, uint32_t *offsets, + uint64_t *modifier) +{ + gbm_pixmap *gp = gbm_pixmap_get(pixmap); + if (!gp) + return 0; + + fds[0] = gbm_bo_get_fd(gp->bo); + strides[0] = gbm_bo_get_stride(gp->bo); + offsets[0] = 0; + *modifier = DRM_FORMAT_MOD_INVALID; + + return 1; +} + +static Bool +xvnc_get_formats(ScreenPtr screen, + CARD32 *num_formats, CARD32 **formats) +{ + ErrorF("xvnc_get_formats\n"); + return FALSE; +} + +static Bool +xvnc_get_modifiers(ScreenPtr screen, uint32_t format, + uint32_t *num_modifiers, uint64_t **modifiers) +{ + ErrorF("xvnc_get_modifiers\n"); + return FALSE; +} + +static Bool +xvnc_get_drawable_modifiers(DrawablePtr draw, uint32_t format, + uint32_t *num_modifiers, uint64_t **modifiers) +{ + ErrorF("xvnc_get_drawable_modifiers\n"); + return FALSE; +} + +static const dri3_screen_info_rec xvnc_dri3_info = { + .version = 2, + .open = NULL, + .pixmap_from_fds = xvnc_pixmap_from_fds, + .fds_from_pixmap = xvnc_fds_from_pixmap, + .open_client = xvnc_dri3_open_client, + .get_formats = xvnc_get_formats, + .get_modifiers = xvnc_get_modifiers, + .get_drawable_modifiers = xvnc_get_drawable_modifiers, +}; + +void xvnc_sync_dri3_pixmap(PixmapPtr pixmap) +{ + // There doesn't seem to be a good hook or sync point, so we do it manually + // here, right before Present copies from the pixmap + DrawablePtr pDraw; + GCPtr gc; + void *ptr; + uint32_t stride, w, h; + void *opaque = NULL; + gbm_pixmap *gp = gbm_pixmap_get(pixmap); + if (!gp) { + ErrorF("Present tried to copy from a non-dri3 pixmap\n"); + return; + } + + w = gbm_bo_get_width(gp->bo); + h = gbm_bo_get_height(gp->bo); + + ptr = gbm_bo_map(gp->bo, 0, 0, w, h, + GBM_BO_TRANSFER_READ, &stride, &opaque); + if (!ptr) { + ErrorF("gbm map failed, errno %d\n", errno); + return; + } + + pDraw = &pixmap->drawable; + if ((gc = GetScratchGC(pDraw->depth, pDraw->pScreen))) { + ValidateGC(pDraw, gc); + //gc->ops->PutImage(pDraw, gc, pDraw->depth, 0, 0, w, h, 0, ZPixmap, data); + fbPutZImage(pDraw, fbGetCompositeClip(gc), gc->alu, fbGetGCPrivate(gc)->pm, + 0, 0, w, h, ptr, stride / sizeof(FbStip)); + FreeScratchGC(gc); + } + + gbm_bo_unmap(gp->bo, opaque); +} + +void xvnc_init_dri3(void) +{ + memset(&priv, 0, sizeof(priv)); + + gettimeofday(&start, NULL); + + if (!dixRegisterPrivateKey(&dri3_pixmap_private_key, PRIVATE_PIXMAP, 0)) + FatalError("dix\n"); + + if (!driNode) + driNode = "/dev/dri/renderD128"; + + priv.fd = open(driNode, O_RDWR | O_CLOEXEC); + if (!priv.fd) + FatalError("Failed to open %s\n", driNode); + + priv.gbm = gbm_create_device(priv.fd); + if (!priv.gbm) + FatalError("Failed to create gbm\n"); + + if (!dri3_screen_init(screenInfo.screens[0], &xvnc_dri3_info)) + FatalError("Couldn't init dri3\n"); +} + +#endif // DRI3 diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index d2c2b63..89cf387 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -72,6 +72,12 @@ from the X Consortium. #include #include #endif /* HAS_SHM */ +#ifdef MITSHM +#include "shmint.h" +#endif +#ifdef HAVE_XSHMFENCE +#include +#endif #include "dix.h" #include "os.h" #include "miline.h" @@ -149,6 +155,8 @@ typedef enum { NORMAL_MEMORY_FB, SHARED_MEMORY_FB } fbMemType; static fbMemType fbmemtype = NORMAL_MEMORY_FB; static int lastScreen = -1; static Bool Render = TRUE; +static Bool hw3d = FALSE; +const char *driNode = NULL; static Bool displaySpecified = FALSE; static char displayNumStr[16]; @@ -350,6 +358,8 @@ void ddxUseMsg(void) ErrorF("+/-render turn on/off RENDER extension support" "(default on)\n"); #endif + ErrorF("-hw3d enable hardware 3d acceleration\n"); + ErrorF("-drinode path use another card than /dev/dri/renderD128\n"); ErrorF("-linebias n adjust thin line pixelization\n"); ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-whitepixel n pixel value for white\n"); @@ -482,6 +492,20 @@ ddxProcessArgument(int argc, char *argv[], int i) return 1; } + if (strcmp (argv[i], "-hw3d") == 0) + { + hw3d = TRUE; + return 1; + } + + if (strcmp (argv[i], "-drinode") == 0) + { + fail_unless_args(argc, i, 1); + ++i; + driNode = argv[i]; + return 2; + } + if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */ { Pixel pix; @@ -1684,6 +1708,15 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) ret = fbPictureInit (pScreen, 0, 0); #endif +#ifdef MITSHM + ShmRegisterFbFuncs(pScreen); +#endif + +#ifdef HAVE_XSHMFENCE + if (!miSyncShmScreenInit(pScreen)) + return FALSE; +#endif + if (!ret) return FALSE; #if XORG < 110 @@ -1796,6 +1829,10 @@ static ExtensionModule glxExt = { #endif #endif +#ifdef DRI3 +extern void xvnc_init_dri3(void); +#endif + void InitOutput(ScreenInfo *scrInfo, int argc, char **argv) { @@ -1872,6 +1909,14 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv) if (!AddCallback(&ClientStateCallback, vfbClientStateChange, 0)) { FatalError("AddCallback failed\n"); } + + if (hw3d) { +#ifdef DRI3 + xvnc_init_dri3(); +#else + FatalError("DRI3 disabled at compile time\n"); +#endif + } } /* end InitOutput */ /* this is just to get the server to link on AIX */ diff --git a/unix/xserver120.patch b/unix/xserver120.patch index 237e1e3..d4fcb77 100644 --- a/unix/xserver120.patch +++ b/unix/xserver120.patch @@ -80,3 +80,14 @@ Index: xserver/mi/miinitext.c {GEExtensionInit, "Generic Event Extension", &noGEExtension}, {ShapeExtensionInit, "SHAPE", NULL}, #ifdef MITSHM +--- xserver.orig/dri3/Makefile.am 2019-02-26 21:28:50.000000000 +0200 ++++ xserver/dri3/Makefile.am 2023-01-18 11:55:45.315851638 +0200 +@@ -1,7 +1,7 @@ + noinst_LTLIBRARIES = libdri3.la + AM_CFLAGS = \ + -DHAVE_XORG_CONFIG_H \ +- @DIX_CFLAGS@ @XORG_CFLAGS@ ++ @DIX_CFLAGS@ @XORG_CFLAGS@ @LIBDRM_CFLAGS@ + + libdri3_la_SOURCES = \ + dri3.h \