From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: QEMU <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH 4/9] virtio-gpu: update headers for virgl/3d
Date: Thu, 10 Sep 2015 14:41:02 +0200 [thread overview]
Message-ID: <CAJ+F1CLBFGbALQMkx_eTkWM7K3PkSUvTMc8_8e-32HKFbCLeVQ@mail.gmail.com> (raw)
In-Reply-To: <1441797654-15350-5-git-send-email-kraxel@redhat.com>
On Wed, Sep 9, 2015 at 1:20 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Sync with linux kernel headers with virgl/3d patches applied.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> include/standard-headers/linux/virtio_gpu.h | 112 +++++++++++++++++++++++++++-
> 1 file changed, 111 insertions(+), 1 deletion(-)
>
> diff --git a/include/standard-headers/linux/virtio_gpu.h b/include/standard-headers/linux/virtio_gpu.h
> index 72ef815..76e5e52 100644
> --- a/include/standard-headers/linux/virtio_gpu.h
> +++ b/include/standard-headers/linux/virtio_gpu.h
> @@ -40,6 +40,8 @@
>
> #include "standard-headers/linux/types.h"
>
> +#define VIRTIO_GPU_FEATURE_VIRGL 0
> +
> enum virtio_gpu_ctrl_type {
> VIRTIO_GPU_UNDEFINED = 0,
>
> @@ -52,6 +54,18 @@ enum virtio_gpu_ctrl_type {
> VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D,
> VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING,
> VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING,
> + VIRTIO_GPU_CMD_GET_CAPSET_INFO,
> + VIRTIO_GPU_CMD_GET_CAPSET,
> +
> + /* 3d commands */
> + VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
> + VIRTIO_GPU_CMD_CTX_DESTROY,
> + VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE,
> + VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE,
> + VIRTIO_GPU_CMD_RESOURCE_CREATE_3D,
> + VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D,
> + VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D,
> + VIRTIO_GPU_CMD_SUBMIT_3D,
>
> /* cursor commands */
> VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300,
> @@ -60,6 +74,8 @@ enum virtio_gpu_ctrl_type {
> /* success responses */
> VIRTIO_GPU_RESP_OK_NODATA = 0x1100,
> VIRTIO_GPU_RESP_OK_DISPLAY_INFO,
> + VIRTIO_GPU_RESP_OK_CAPSET_INFO,
> + VIRTIO_GPU_RESP_OK_CAPSET,
>
> /* error responses */
> VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
> @@ -180,13 +196,107 @@ struct virtio_gpu_resp_display_info {
> } pmodes[VIRTIO_GPU_MAX_SCANOUTS];
> };
>
> +/* data passed in the control vq, 3d related */
> +
> +struct virtio_gpu_box {
> + uint32_t x, y, z;
> + uint32_t w, h, d;
> +};
> +
> +/* VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D, VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D */
> +struct virtio_gpu_transfer_host_3d {
> + struct virtio_gpu_ctrl_hdr hdr;
> + struct virtio_gpu_box box;
> + uint64_t offset;
> + uint32_t resource_id;
> + uint32_t level;
> + uint32_t stride;
> + uint32_t layer_stride;
> +};
> +
> +/* VIRTIO_GPU_CMD_RESOURCE_CREATE_3D */
> +#define VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP (1 << 0)
> +struct virtio_gpu_resource_create_3d {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t resource_id;
> + uint32_t target;
> + uint32_t format;
> + uint32_t bind;
> + uint32_t width;
> + uint32_t height;
> + uint32_t depth;
> + uint32_t array_size;
> + uint32_t last_level;
> + uint32_t nr_samples;
> + uint32_t flags;
> + uint32_t padding;
> +};
> +
> +/* VIRTIO_GPU_CMD_CTX_CREATE */
> +struct virtio_gpu_ctx_create {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t nlen;
> + uint32_t padding;
> + char debug_name[64];
> +};
> +
> +/* VIRTIO_GPU_CMD_CTX_DESTROY */
> +struct virtio_gpu_ctx_destroy {
> + struct virtio_gpu_ctrl_hdr hdr;
> +};
> +
> +/* VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE, VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE */
> +struct virtio_gpu_ctx_resource {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t resource_id;
> + uint32_t padding;
> +};
> +
> +/* VIRTIO_GPU_CMD_SUBMIT_3D */
> +struct virtio_gpu_cmd_submit {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t size;
> + uint32_t padding;
> +};
> +
> +#define VIRTIO_GPU_CAPSET_VIRGL 1
> +
> +/* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
> +struct virtio_gpu_get_capset_info {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t capset_index;
> + uint32_t padding;
> +};
> +
> +/* VIRTIO_GPU_RESP_OK_CAPSET_INFO */
> +struct virtio_gpu_resp_capset_info {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t capset_id;
> + uint32_t capset_max_version;
> + uint32_t capset_max_size;
> + uint32_t padding;
> +};
> +
> +/* VIRTIO_GPU_CMD_GET_CAPSET */
> +struct virtio_gpu_get_capset {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint32_t capset_id;
> + uint32_t capset_version;
> +};
> +
> +/* VIRTIO_GPU_RESP_OK_CAPSET */
> +struct virtio_gpu_resp_capset {
> + struct virtio_gpu_ctrl_hdr hdr;
> + uint8_t capset_data[];
> +};
> +
> #define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)
>
> struct virtio_gpu_config {
> uint32_t events_read;
> uint32_t events_clear;
> uint32_t num_scanouts;
> - uint32_t reserved;
> + uint32_t num_capsets;
> };
>
> /* simple formats for fbcon/X use */
> --
> 1.8.3.1
>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
--
Marc-André Lureau
next prev parent reply other threads:[~2015-09-10 12:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-09 11:20 [Qemu-devel] [PATCH 0/9] add virgl rendering support Gerd Hoffmann
2015-09-09 11:20 ` [Qemu-devel] [PATCH 1/9] shaders: initialize vertexes once Gerd Hoffmann
2015-09-10 12:40 ` Marc-André Lureau
2015-09-10 13:22 ` Gerd Hoffmann
2015-09-10 13:42 ` Marc-André Lureau
2015-09-10 14:59 ` Gerd Hoffmann
2015-09-14 16:00 ` Max Reitz
2015-09-14 16:19 ` Max Reitz
2015-09-15 7:10 ` Gerd Hoffmann
2015-09-09 11:20 ` [Qemu-devel] [PATCH 2/9] sdl2: quick & dirty flicker workaround Gerd Hoffmann
2015-09-10 12:40 ` Marc-André Lureau
2015-09-14 16:16 ` Max Reitz
2015-09-09 11:20 ` [Qemu-devel] [PATCH 3/9] ui/console: add opengl context and scanout support interfaces Gerd Hoffmann
2015-09-10 12:40 ` Marc-André Lureau
2015-09-15 8:30 ` Paolo Bonzini
2015-09-09 11:20 ` [Qemu-devel] [PATCH 4/9] virtio-gpu: update headers for virgl/3d Gerd Hoffmann
2015-09-10 12:41 ` Marc-André Lureau [this message]
2015-09-09 11:20 ` [Qemu-devel] [PATCH 5/9] virtio-gpu: add 3d mode and virgl rendering support Gerd Hoffmann
2015-09-14 18:14 ` Max Reitz
2015-09-15 7:33 ` Gerd Hoffmann
2015-09-15 8:33 ` Paolo Bonzini
2015-09-09 11:20 ` [Qemu-devel] [PATCH 6/9] sdl2/opengl: add opengl context and scanout support Gerd Hoffmann
2015-09-14 18:49 ` Max Reitz
2015-09-15 7:54 ` Gerd Hoffmann
2015-09-16 13:44 ` Max Reitz
2015-09-09 11:20 ` [Qemu-devel] [PATCH 7/9] opengl: add egl-context.[ch] helpers Gerd Hoffmann
2015-09-11 14:13 ` Marc-André Lureau
2015-09-09 11:20 ` [Qemu-devel] [PATCH 8/9] gtk/opengl: add opengl context and scanout support (egl) Gerd Hoffmann
2015-09-11 14:36 ` Marc-André Lureau
2015-09-09 11:20 ` [Qemu-devel] [PATCH 9/9] gtk/opengl: add opengl context and scanout support (GtkGLArea) Gerd Hoffmann
2015-09-11 14:44 ` Marc-André Lureau
2015-09-14 13:50 ` Gerd Hoffmann
2015-09-11 16:10 ` [Qemu-devel] [PATCH 0/9] add virgl rendering support Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJ+F1CLBFGbALQMkx_eTkWM7K3PkSUvTMc8_8e-32HKFbCLeVQ@mail.gmail.com \
--to=marcandre.lureau@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.