From 9aa33f19004575bcfbf49e8a39d7df1c770a1905 Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Tue, 21 Mar 2023 12:21:40 -0700 Subject: [PATCH] KASM-4151 copying over fixes from gnome_blank branch --- unix/xserver/hw/vnc/dri3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/unix/xserver/hw/vnc/dri3.c b/unix/xserver/hw/vnc/dri3.c index 3422af8..d0540de 100644 --- a/unix/xserver/hw/vnc/dri3.c +++ b/unix/xserver/hw/vnc/dri3.c @@ -219,9 +219,14 @@ void xvnc_sync_dri3_pixmap(PixmapPtr pixmap) void *ptr; uint32_t stride, w, h; void *opaque = NULL; + + // We may not be running on hw if there's a compositor using PRESENT on llvmpipe + if (!driNode) + return; + gbm_pixmap *gp = gbm_pixmap_get(pixmap); if (!gp) { - ErrorF("Present tried to copy from a non-dri3 pixmap\n"); + //ErrorF("Present tried to copy from a non-dri3 pixmap\n"); return; }