subject:"\[Qemu\-devel\] \[PATCH\] virtio\-gpu\-3d\: add support for second capability set \(v2\)"

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

2018-02-22 Thread no-reply

Hi,

This series failed docker-build@min-glib build test. Please find the testing 
commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

Type: series
Message-id: 20180221015035.22964-1-airl...@gmail.com
Subject: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability 
set (v2)

=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-build@min-glib
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
37ddbfb9f7 virtio-gpu-3d: add support for second capability set (v2)

=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-xti5bwto/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
  BUILD   min-glib
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-xti5bwto/src'
  GEN 
/var/tmp/patchew-tester-tmp-xti5bwto/src/docker-src.2018-02-22-18.36.07.22434/qemu.tar
Cloning into 
'/var/tmp/patchew-tester-tmp-xti5bwto/src/docker-src.2018-02-22-18.36.07.22434/qemu.tar.vroot'...
done.
Checking out files:  45% (2676/5854)   
Checking out files:  46% (2693/5854)   
Checking out files:  47% (2752/5854)   
Checking out files:  48% (2810/5854)   
Checking out files:  49% (2869/5854)   
Checking out files:  50% (2927/5854)   
Checking out files:  51% (2986/5854)   
Checking out files:  52% (3045/5854)   
Checking out files:  53% (3103/5854)   
Checking out files:  54% (3162/5854)   
Checking out files:  55% (3220/5854)   
Checking out files:  56% (3279/5854)   
Checking out files:  57% (3337/5854)   
Checking out files:  58% (3396/5854)   
Checking out files:  59% (3454/5854)   
Checking out files:  60% (3513/5854)   
Checking out files:  61% (3571/5854)   
Checking out files:  62% (3630/5854)   
Checking out files:  63% (3689/5854)   
Checking out files:  64% (3747/5854)   
Checking out files:  65% (3806/5854)   
Checking out files:  66% (3864/5854)   
Checking out files:  67% (3923/5854)   
Checking out files:  68% (3981/5854)   
Checking out files:  69% (4040/5854)   
Checking out files:  70% (4098/5854)   
Checking out files:  71% (4157/5854)   
Checking out files:  72% (4215/5854)   
Checking out files:  73% (4274/5854)   
Checking out files:  74% (4332/5854)   
Checking out files:  75% (4391/5854)   
Checking out files:  75% (4443/5854)   
Checking out files:  76% (4450/5854)   
Checking out files:  77% (4508/5854)   
Checking out files:  78% (4567/5854)   
Checking out files:  79% (4625/5854)   
Checking out files:  80% (4684/5854)   
Checking out files:  81% (4742/5854)   
Checking out files:  82% (4801/5854)   
Checking out files:  83% (4859/5854)   
Checking out files:  84% (4918/5854)   
Checking out files:  85% (4976/5854)   
Checking out files:  86% (5035/5854)   
Checking out files:  87% (5093/5854)   
Checking out files:  88% (5152/5854)   
Checking out files:  89% (5211/5854)   
Checking out files:  90% (5269/5854)   
Checking out files:  91% (5328/5854)   
Checking out files:  92% (5386/5854)   
Checking out files:  93% (5445/5854)   
Checking out files:  94% (5503/5854)   
Checking out files:  95% (5562/5854)   
Checking out files:  96% (5620/5854)   
Checking out files:  97% (5679/5854)   
Checking out files:  98% (5737/5854)   
Checking out files:  99% (5796/5854)   
Checking out files: 100% (5854/5854)   
Checking out files: 100% (5854/5854), done.
Your branch is up-to-date with 'origin/test'.
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into 
'/var/tmp/patchew-tester-tmp-xti5bwto/src/docker-src.2018-02-22-18.36.07.22434/qemu.tar.vroot/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered 
for path 'ui/keycodemapdb'
Cloning into 
'/var/tmp/patchew-tester-tmp-xti5bwto/src/docker-src.2018-02-22-18.36.07.22434/qemu.tar.vroot/ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out 
'6b3d716e2b6472eb7189d3220552280ef3d832ce'
  COPYRUNNER
RUN test-build in qemu:min-glib 
Environment variables:
HOSTNAME=5daa723c7c6f
MAKEFLAGS= -j8
J=8
CCACHE_DIR=/var/tmp/ccache
EXTRA_CONFIGURE_OPTS=
V=
SHOW_ENV=1
PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
TARGET_LIST=
SHLVL=1
HOME=/root
TEST_DIR=/tmp/qemu-test
FEATURES= dtc
DEBUG=
_=/usr/bin/env

Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu 
--prefix=/tmp/qemu-test/install
No C++ compiler available; disabling C++ specific optional code
Install prefix/tmp/qemu-test/install
BIOS directory/tmp/qemu-test/install/share/qemu
firmware path /tmp/qemu-test/install/share/qemu-firmware
binary directory  /tmp/qemu-test/install/bin
library directory /tmp/qemu

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

2018-02-22 Thread no-reply

Hi,

This series failed docker-quick@centos6 build test. Please find the testing 
commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

Type: series
Message-id: 20180221015035.22964-1-airl...@gmail.com
Subject: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability 
set (v2)

=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-quick@centos6
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
37ddbfb9f7 virtio-gpu-3d: add support for second capability set (v2)

=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-bpg1ky9u/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
  BUILD   centos6
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-bpg1ky9u/src'
  GEN 
/var/tmp/patchew-tester-tmp-bpg1ky9u/src/docker-src.2018-02-22-07.57.36.17939/qemu.tar
Cloning into 
'/var/tmp/patchew-tester-tmp-bpg1ky9u/src/docker-src.2018-02-22-07.57.36.17939/qemu.tar.vroot'...
done.
Your branch is up-to-date with 'origin/test'.
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into 
'/var/tmp/patchew-tester-tmp-bpg1ky9u/src/docker-src.2018-02-22-07.57.36.17939/qemu.tar.vroot/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered 
for path 'ui/keycodemapdb'
Cloning into 
'/var/tmp/patchew-tester-tmp-bpg1ky9u/src/docker-src.2018-02-22-07.57.36.17939/qemu.tar.vroot/ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out 
'6b3d716e2b6472eb7189d3220552280ef3d832ce'
  COPYRUNNER
RUN test-quick in qemu:centos6 
Packages installed:
SDL-devel-1.2.14-7.el6_7.1.x86_64
bison-2.4.1-5.el6.x86_64
bzip2-devel-1.0.5-7.el6_0.x86_64
ccache-3.1.6-2.el6.x86_64
csnappy-devel-0-6.20150729gitd7bc683.el6.x86_64
flex-2.5.35-9.el6.x86_64
gcc-4.4.7-18.el6.x86_64
gettext-0.17-18.el6.x86_64
git-1.7.1-9.el6_9.x86_64
glib2-devel-2.28.8-9.el6.x86_64
libepoxy-devel-1.2-3.el6.x86_64
libfdt-devel-1.4.0-1.el6.x86_64
librdmacm-devel-1.0.21-0.el6.x86_64
lzo-devel-2.03-3.1.el6_5.1.x86_64
make-3.81-23.el6.x86_64
mesa-libEGL-devel-11.0.7-4.el6.x86_64
mesa-libgbm-devel-11.0.7-4.el6.x86_64
package g++ is not installed
pixman-devel-0.32.8-1.el6.x86_64
spice-glib-devel-0.26-8.el6.x86_64
spice-server-devel-0.12.4-16.el6.x86_64
tar-1.23-15.el6_8.x86_64
vte-devel-0.25.1-9.el6.x86_64
xen-devel-4.6.6-2.el6.x86_64
zlib-devel-1.2.3-29.el6.x86_64

Environment variables:
PACKAGES=bison bzip2-devel ccache csnappy-devel flex g++
 gcc gettext git glib2-devel libepoxy-devel libfdt-devel
 librdmacm-devel lzo-devel make mesa-libEGL-devel 
mesa-libgbm-devel pixman-devel SDL-devel spice-glib-devel 
spice-server-devel tar vte-devel xen-devel zlib-devel
HOSTNAME=e4c50c4fd574
MAKEFLAGS= -j8
J=8
CCACHE_DIR=/var/tmp/ccache
EXTRA_CONFIGURE_OPTS=
V=
SHOW_ENV=1
PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
TARGET_LIST=
SHLVL=1
HOME=/root
TEST_DIR=/tmp/qemu-test
FEATURES= dtc
DEBUG=
_=/usr/bin/env

Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu 
--prefix=/tmp/qemu-test/install
No C++ compiler available; disabling C++ specific optional code
Install prefix/tmp/qemu-test/install
BIOS directory/tmp/qemu-test/install/share/qemu
firmware path /tmp/qemu-test/install/share/qemu-firmware
binary directory  /tmp/qemu-test/install/bin
library directory /tmp/qemu-test/install/lib
module directory  /tmp/qemu-test/install/lib/qemu
libexec directory /tmp/qemu-test/install/libexec
include directory /tmp/qemu-test/install/include
config directory  /tmp/qemu-test/install/etc
local state directory   /tmp/qemu-test/install/var
Manual directory  /tmp/qemu-test/install/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path   /tmp/qemu-test/src
GIT binarygit
GIT submodules
C compilercc
Host C compiler   cc
C++ compiler  
Objective-C compiler cc
ARFLAGS   rv
CFLAGS-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g 
QEMU_CFLAGS   -I/usr/include/pixman-1   -I$(SRC_PATH)/dtc/libfdt -pthread 
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include   -DNCURSES_WIDECHAR   
-fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 
-D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef 
-Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv  
-Wendif-labels -Wno-missing-include-dirs -Wempty-body -Wnested-externs 
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers 
-Wold-style-declaration -Wold-style

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

2018-02-22 Thread no-reply

Hi,

This series failed docker-mingw@fedora build test. Please find the testing 
commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

Type: series
Message-id: 20180221015035.22964-1-airl...@gmail.com
Subject: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability 
set (v2)

=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-mingw@fedora
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
37ddbfb9f7 virtio-gpu-3d: add support for second capability set (v2)

=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-6y2lxqve/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
  BUILD   fedora
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-6y2lxqve/src'
  GEN 
/var/tmp/patchew-tester-tmp-6y2lxqve/src/docker-src.2018-02-22-06.27.24.17208/qemu.tar
Cloning into 
'/var/tmp/patchew-tester-tmp-6y2lxqve/src/docker-src.2018-02-22-06.27.24.17208/qemu.tar.vroot'...
done.
Checking out files:  46% (2733/5854)   
Checking out files:  47% (2752/5854)   
Checking out files:  48% (2810/5854)   
Checking out files:  49% (2869/5854)   
Checking out files:  50% (2927/5854)   
Checking out files:  51% (2986/5854)   
Checking out files:  52% (3045/5854)   
Checking out files:  53% (3103/5854)   
Checking out files:  54% (3162/5854)   
Checking out files:  55% (3220/5854)   
Checking out files:  56% (3279/5854)   
Checking out files:  57% (3337/5854)   
Checking out files:  58% (3396/5854)   
Checking out files:  59% (3454/5854)   
Checking out files:  60% (3513/5854)   
Checking out files:  61% (3571/5854)   
Checking out files:  62% (3630/5854)   
Checking out files:  63% (3689/5854)   
Checking out files:  64% (3747/5854)   
Checking out files:  65% (3806/5854)   
Checking out files:  66% (3864/5854)   
Checking out files:  67% (3923/5854)   
Checking out files:  68% (3981/5854)   
Checking out files:  69% (4040/5854)   
Checking out files:  70% (4098/5854)   
Checking out files:  71% (4157/5854)   
Checking out files:  72% (4215/5854)   
Checking out files:  73% (4274/5854)   
Checking out files:  74% (4332/5854)   
Checking out files:  75% (4391/5854)   
Checking out files:  76% (4450/5854)   
Checking out files:  77% (4508/5854)   
Checking out files:  78% (4567/5854)   
Checking out files:  79% (4625/5854)   
Checking out files:  80% (4684/5854)   
Checking out files:  81% (4742/5854)   
Checking out files:  82% (4801/5854)   
Checking out files:  83% (4859/5854)   
Checking out files:  84% (4918/5854)   
Checking out files:  85% (4976/5854)   
Checking out files:  86% (5035/5854)   
Checking out files:  87% (5093/5854)   
Checking out files:  88% (5152/5854)   
Checking out files:  89% (5211/5854)   
Checking out files:  90% (5269/5854)   
Checking out files:  91% (5328/5854)   
Checking out files:  92% (5386/5854)   
Checking out files:  93% (5445/5854)   
Checking out files:  94% (5503/5854)   
Checking out files:  95% (5562/5854)   
Checking out files:  96% (5620/5854)   
Checking out files:  97% (5679/5854)   
Checking out files:  98% (5737/5854)   
Checking out files:  99% (5796/5854)   
Checking out files: 100% (5854/5854)   
Checking out files: 100% (5854/5854), done.
Your branch is up-to-date with 'origin/test'.
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into 
'/var/tmp/patchew-tester-tmp-6y2lxqve/src/docker-src.2018-02-22-06.27.24.17208/qemu.tar.vroot/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered 
for path 'ui/keycodemapdb'
Cloning into 
'/var/tmp/patchew-tester-tmp-6y2lxqve/src/docker-src.2018-02-22-06.27.24.17208/qemu.tar.vroot/ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out 
'6b3d716e2b6472eb7189d3220552280ef3d832ce'
  COPYRUNNER
RUN test-mingw in qemu:fedora 
Packages installed:
PyYAML-3.12-5.fc27.x86_64
SDL-devel-1.2.15-29.fc27.x86_64
bc-1.07.1-3.fc27.x86_64
bison-3.0.4-8.fc27.x86_64
bzip2-1.0.6-24.fc27.x86_64
ccache-3.3.5-1.fc27.x86_64
clang-5.0.1-1.fc27.x86_64
findutils-4.6.0-14.fc27.x86_64
flex-2.6.1-5.fc27.x86_64
gcc-7.3.1-2.fc27.x86_64
gcc-c++-7.3.1-2.fc27.x86_64
gettext-0.19.8.1-12.fc27.x86_64
git-2.14.3-2.fc27.x86_64
glib2-devel-2.54.3-2.fc27.x86_64
hostname-3.18-4.fc27.x86_64
libaio-devel-0.3.110-9.fc27.x86_64
libasan-7.3.1-2.fc27.x86_64
libfdt-devel-1.4.6-1.fc27.x86_64
libubsan-7.3.1-2.fc27.x86_64
make-4.2.1-4.fc27.x86_64
mingw32-SDL-1.2.15-9.fc27.noarch
mingw32-bzip2-1.0.6-9.fc27.noarch
mingw32-curl-7.54.1-2.fc27.noarch
mingw32-glib2-2.54.1-1.fc27.noarch
mingw32-gmp-6.1.2-2.fc27.noarch
mingw32-gnutls-3.5.13-2.fc27.noarch
mingw32-gtk2-2.24.31-4.fc27

[Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

2018-02-20 Thread Dave Airlie

From: Dave Airlie 

Due to a kernel bug we can never increase the size of capability
set 1, so introduce a new capability set in parallel, old userspace
will continue to use the old set, new userspace will start using
the new one when it detects a fixed kernel.

v2: don't use a define from virglrenderer, just probe it.

Signed-off-by: Dave Airlie 
---
 hw/display/virtio-gpu-3d.c  | 5 +
 hw/display/virtio-gpu.c | 7 ++-
 include/standard-headers/linux/virtio_gpu.h | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index 7db84efe89..c601b43810 100644
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -362,6 +362,11 @@ static void virgl_cmd_get_capset_info(VirtIOGPU *g,
 virgl_renderer_get_cap_set(resp.capset_id,
_max_version,
_max_size);
+} else if (info.capset_index == 1) {
+resp.capset_id = VIRTIO_GPU_CAPSET_VIRGL2;
+virgl_renderer_get_cap_set(resp.capset_id,
+   _max_version,
+   _max_size);
 } else {
 resp.capset_max_version = 0;
 resp.capset_max_size = 0;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 6658f6c6a6..1418db1b88 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1212,10 +1212,15 @@ static void virtio_gpu_device_realize(DeviceState 
*qdev, Error **errp)
 g->req_state[0].height = g->conf.yres;
 
 if (virtio_gpu_virgl_enabled(g->conf)) {
+uint32_t capset2_max_ver, capset2_max_size;
 /* use larger control queue in 3d mode */
 g->ctrl_vq   = virtio_add_queue(vdev, 256, virtio_gpu_handle_ctrl_cb);
 g->cursor_vq = virtio_add_queue(vdev, 16, virtio_gpu_handle_cursor_cb);
-g->virtio_config.num_capsets = 1;
+
+virgl_renderer_get_cap_set(VIRTIO_GPU_CAPSET_VIRGL2,
+   _max_ver,
+   _max_size);
+g->virtio_config.num_capsets = capset2_max_ver > 0 ? 2 : 1;
 } else {
 g->ctrl_vq   = virtio_add_queue(vdev, 64, virtio_gpu_handle_ctrl_cb);
 g->cursor_vq = virtio_add_queue(vdev, 16, virtio_gpu_handle_cursor_cb);
diff --git a/include/standard-headers/linux/virtio_gpu.h 
b/include/standard-headers/linux/virtio_gpu.h
index c1c8f0751d..52a830dcf8 100644
--- a/include/standard-headers/linux/virtio_gpu.h
+++ b/include/standard-headers/linux/virtio_gpu.h
@@ -260,6 +260,7 @@ struct virtio_gpu_cmd_submit {
 };
 
 #define VIRTIO_GPU_CAPSET_VIRGL 1
+#define VIRTIO_GPU_CAPSET_VIRGL2 2
 
 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
 struct virtio_gpu_get_capset_info {
-- 
2.14.3

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

Re: [Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

[Qemu-devel] [PATCH] virtio-gpu-3d: add support for second capability set (v2)

4 matches

Site Navigation

Mail list logo

Footer information