| Message ID | YT3PR01MB5857E808EDF6949F2DF517FDAFA12@YT3PR01MB5857.CANPRD01.PROD.OUTLOOK.COM (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] drm/virtio: Add capset definitions | expand |
On 3/27/25 18:25, Aaron Ruby wrote: > > Since the context-type additions to the virtio-gpu spec, these have been > defined locally in guest user-space, and virtio-gpu backend library code. > > Now, these capsets have been stabilized, and should be defined in > a common space, in both the virtio_gpu header, and alongside the virtgpu_drm > interface that they apply to. > > Signed-off-by: Aaron Ruby <aruby@qnx.com> > --- > include/uapi/drm/virtgpu_drm.h | 6 ++++++ > include/uapi/linux/virtio_gpu.h | 3 ++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > index c2ce71987e9b..9debb320c34b 100644 > --- a/include/uapi/drm/virtgpu_drm.h > +++ b/include/uapi/drm/virtgpu_drm.h > @@ -163,6 +163,12 @@ struct drm_virtgpu_3d_wait { > __u32 flags; > }; > > +#define VIRTGPU_DRM_CAPSET_VIRGL 1 > +#define VIRTGPU_DRM_CAPSET_VIRGL2 2 > +#define VIRTGPU_DRM_CAPSET_GFXSTREAM_VULKAN 3 > +#define VIRTGPU_DRM_CAPSET_VENUS 4 > +#define VIRTGPU_DRM_CAPSET_CROSS_DOMAIN 5 > +#define VIRTGPU_DRM_CAPSET_DRM 6 > struct drm_virtgpu_get_caps { > __u32 cap_set_id; > __u32 cap_set_ver; > diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h > index bf2c9cabd207..be109777d10d 100644 > --- a/include/uapi/linux/virtio_gpu.h > +++ b/include/uapi/linux/virtio_gpu.h > @@ -309,8 +309,9 @@ struct virtio_gpu_cmd_submit { > > #define VIRTIO_GPU_CAPSET_VIRGL 1 > #define VIRTIO_GPU_CAPSET_VIRGL2 2 > -/* 3 is reserved for gfxstream */ > +#define VIRTIO_GPU_CAPSET_GFXSTREAM_VULKAN 3 > #define VIRTIO_GPU_CAPSET_VENUS 4 > +#define VIRTIO_GPU_CAPSET_CROSS_DOMAIN 5 > #define VIRTIO_GPU_CAPSET_DRM 6 > > /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */ Applied to misc-next, thanks! Your email provider still adding junk to email, but git-apply worked this time. In a such cases sending patches from a personal email address is an option. You should add r-b and other tags to new patch version that were given to a previous version. I corrected it. Again, please follow the kernel patch submission guide, use scripts/get_maintainer.pl and etc.
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index c2ce71987e9b..9debb320c34b 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -163,6 +163,12 @@ struct drm_virtgpu_3d_wait { __u32 flags; }; +#define VIRTGPU_DRM_CAPSET_VIRGL 1 +#define VIRTGPU_DRM_CAPSET_VIRGL2 2 +#define VIRTGPU_DRM_CAPSET_GFXSTREAM_VULKAN 3 +#define VIRTGPU_DRM_CAPSET_VENUS 4 +#define VIRTGPU_DRM_CAPSET_CROSS_DOMAIN 5 +#define VIRTGPU_DRM_CAPSET_DRM 6 struct drm_virtgpu_get_caps { __u32 cap_set_id; __u32 cap_set_ver; diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h index bf2c9cabd207..be109777d10d 100644 --- a/include/uapi/linux/virtio_gpu.h +++ b/include/uapi/linux/virtio_gpu.h @@ -309,8 +309,9 @@ struct virtio_gpu_cmd_submit { #define VIRTIO_GPU_CAPSET_VIRGL 1 #define VIRTIO_GPU_CAPSET_VIRGL2 2 -/* 3 is reserved for gfxstream */ +#define VIRTIO_GPU_CAPSET_GFXSTREAM_VULKAN 3 #define VIRTIO_GPU_CAPSET_VENUS 4 +#define VIRTIO_GPU_CAPSET_CROSS_DOMAIN 5 #define VIRTIO_GPU_CAPSET_DRM 6 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
Since the context-type additions to the virtio-gpu spec, these have been defined locally in guest user-space, and virtio-gpu backend library code. Now, these capsets have been stabilized, and should be defined in a common space, in both the virtio_gpu header, and alongside the virtgpu_drm interface that they apply to. Signed-off-by: Aaron Ruby <aruby@qnx.com> --- include/uapi/drm/virtgpu_drm.h | 6 ++++++ include/uapi/linux/virtio_gpu.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)