[Qemu-devel] [PATCH 0/3] add drm modifier support for dmabufs.

[Qemu-devel] [PATCH 0/3] add drm modifier support for dmabufs.

[Gerd Hoffmann]

Gerd Hoffmann (3):
  console: add dmabuf modifier field.
  vfio/display: set dmabuf modifier field
  egl-helpers: add dmabuf modifier support.

 include/ui/console.h     |  1 +
 include/ui/egl-helpers.h |  3 ++-
 hw/vfio/display.c        |  1 +
 ui/egl-helpers.c         | 37 ++++++++++++++++++++++++++-----------
 ui/spice-display.c       |  7 ++++---
 5 files changed, 34 insertions(+), 15 deletions(-)

-- 
2.18.1

[Qemu-devel] [PATCH 1/3] console: add dmabuf modifier field.

[Gerd Hoffmann]

dmabufs can have a format modifier (DRM_FORMAT_MOD_*) which is used for
tiled layouts for example.  Add a field to QemuDmaBuf so we can carry
around that information.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/ui/console.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/ui/console.h b/include/ui/console.h
index fef900db76a5..f9816968487c 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -175,6 +175,7 @@ typedef struct QemuDmaBuf {
     uint32_t  height;
     uint32_t  stride;
     uint32_t  fourcc;
+    uint64_t  modifier;
     uint32_t  texture;
     bool      y0_top;
 } QemuDmaBuf;
-- 
2.18.1

Re: [Qemu-devel] [PATCH 1/3] console: add dmabuf modifier field.

[Marc-André Lureau]

On Wed, May 22, 2019 at 12:05 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> dmabufs can have a format modifier (DRM_FORMAT_MOD_*) which is used for
> tiled layouts for example.  Add a field to QemuDmaBuf so we can carry
> around that information.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  include/ui/console.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/ui/console.h b/include/ui/console.h
> index fef900db76a5..f9816968487c 100644
> --- a/include/ui/console.h
> +++ b/include/ui/console.h
> @@ -175,6 +175,7 @@ typedef struct QemuDmaBuf {
>      uint32_t  height;
>      uint32_t  stride;
>      uint32_t  fourcc;
> +    uint64_t  modifier;
>      uint32_t  texture;
>      bool      y0_top;
>  } QemuDmaBuf;
> --
> 2.18.1
>
>


-- 
Marc-André Lureau

[Qemu-devel] [PATCH 2/3] vfio/display: set dmabuf modifier field

[Gerd Hoffmann]

Fill the new QemuDmaBuf->modifier field properly from plane info.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vfio/display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index a3d9c8f5beac..13969180b2dd 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -248,6 +248,7 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev,
     dmabuf->buf.height = plane.height;
     dmabuf->buf.stride = plane.stride;
     dmabuf->buf.fourcc = plane.drm_format;
+    dmabuf->buf.modifier = plane.drm_format_mod;
     dmabuf->buf.fd     = fd;
     if (plane_type == DRM_PLANE_TYPE_CURSOR) {
         vfio_display_update_cursor(dmabuf, &plane);
-- 
2.18.1

Re: [Qemu-devel] [PATCH 2/3] vfio/display: set dmabuf modifier field

[Marc-André Lureau]

On Wed, May 22, 2019 at 12:05 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Fill the new QemuDmaBuf->modifier field properly from plane info.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  hw/vfio/display.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/vfio/display.c b/hw/vfio/display.c
> index a3d9c8f5beac..13969180b2dd 100644
> --- a/hw/vfio/display.c
> +++ b/hw/vfio/display.c
> @@ -248,6 +248,7 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev,
>      dmabuf->buf.height = plane.height;
>      dmabuf->buf.stride = plane.stride;
>      dmabuf->buf.fourcc = plane.drm_format;
> +    dmabuf->buf.modifier = plane.drm_format_mod;
>      dmabuf->buf.fd     = fd;
>      if (plane_type == DRM_PLANE_TYPE_CURSOR) {
>          vfio_display_update_cursor(dmabuf, &plane);
> --
> 2.18.1
>
>


-- 
Marc-André Lureau

[Qemu-devel] [PATCH 3/3] egl-helpers: add dmabuf modifier support.

[Gerd Hoffmann]

Add modifier parameter to egl_get_fd_for_texture(), to return the used
modifier on dmabuf exports.

Check and use QemuDmaBuf->modifier in egl_dmabuf_import_texture() for
dmabuf imports.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/ui/egl-helpers.h |  3 ++-
 ui/egl-helpers.c         | 37 ++++++++++++++++++++++++++-----------
 ui/spice-display.c       |  7 ++++---
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
index b976cb872821..d71412779913 100644
--- a/include/ui/egl-helpers.h
+++ b/include/ui/egl-helpers.h
@@ -36,7 +36,8 @@ extern struct gbm_device *qemu_egl_rn_gbm_dev;
 extern EGLContext qemu_egl_rn_ctx;
 
 int egl_rendernode_init(const char *rendernode, DisplayGLMode mode);
-int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc);
+int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc,
+                           EGLuint64KHR *modifier);
 
 void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf);
 void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf);
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index e90eef8c9c3a..87bfd32e8ddb 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -200,7 +200,8 @@ err:
     return -1;
 }
 
-int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
+int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc,
+                           EGLuint64KHR *modifier)
 {
     EGLImageKHR image;
     EGLint num_planes, fd;
@@ -214,7 +215,7 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
     }
 
     eglExportDMABUFImageQueryMESA(qemu_egl_display, image, fourcc,
-                                  &num_planes, NULL);
+                                  &num_planes, modifier);
     if (num_planes != 1) {
         eglDestroyImageKHR(qemu_egl_display, image);
         return -1;
@@ -228,20 +229,34 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
 void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf)
 {
     EGLImageKHR image = EGL_NO_IMAGE_KHR;
-    EGLint attrs[] = {
-        EGL_DMA_BUF_PLANE0_FD_EXT,      dmabuf->fd,
-        EGL_DMA_BUF_PLANE0_PITCH_EXT,   dmabuf->stride,
-        EGL_DMA_BUF_PLANE0_OFFSET_EXT,  0,
-        EGL_WIDTH,                      dmabuf->width,
-        EGL_HEIGHT,                     dmabuf->height,
-        EGL_LINUX_DRM_FOURCC_EXT,       dmabuf->fourcc,
-        EGL_NONE, /* end of list */
-    };
+    EGLint attrs[64];
+    int i = 0;
 
     if (dmabuf->texture != 0) {
         return;
     }
 
+    attrs[i++] = EGL_WIDTH;
+    attrs[i++] = dmabuf->width;
+    attrs[i++] = EGL_HEIGHT;
+    attrs[i++] = dmabuf->height;
+    attrs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
+    attrs[i++] = dmabuf->fourcc;
+
+    attrs[i++] = EGL_DMA_BUF_PLANE0_FD_EXT;
+    attrs[i++] = dmabuf->fd;
+    attrs[i++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
+    attrs[i++] = dmabuf->stride;
+    attrs[i++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
+    attrs[i++] = 0;
+    if (dmabuf->modifier) {
+        attrs[i++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
+        attrs[i++] = (dmabuf->modifier >>  0) & 0xffffffff;
+        attrs[i++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
+        attrs[i++] = (dmabuf->modifier >> 32) & 0xffffffff;
+    }
+    attrs[i++] = EGL_NONE;
+
     image = eglCreateImageKHR(qemu_egl_display,
                               EGL_NO_CONTEXT,
                               EGL_LINUX_DMA_BUF_EXT,
diff --git a/ui/spice-display.c b/ui/spice-display.c
index a5e26479a866..104df2302575 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -888,7 +888,8 @@ static void spice_gl_switch(DisplayChangeListener *dcl,
     if (ssd->ds) {
         surface_gl_create_texture(ssd->gls, ssd->ds);
         fd = egl_get_fd_for_texture(ssd->ds->texture,
-                                    &stride, &fourcc);
+                                    &stride, &fourcc,
+                                    NULL);
         if (fd < 0) {
             surface_gl_destroy_texture(ssd->gls, ssd->ds);
             return;
@@ -945,7 +946,7 @@ static void qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl,
     int fd = -1;
 
     assert(tex_id);
-    fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc);
+    fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc, NULL);
     if (fd < 0) {
         fprintf(stderr, "%s: failed to get fd for texture\n", __func__);
         return;
@@ -1063,7 +1064,7 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl,
                 egl_fb_setup_new_tex(&ssd->blit_fb,
                                      dmabuf->width, dmabuf->height);
                 fd = egl_get_fd_for_texture(ssd->blit_fb.texture,
-                                            &stride, &fourcc);
+                                            &stride, &fourcc, NULL);
                 spice_qxl_gl_scanout(&ssd->qxl, fd,
                                      dmabuf->width, dmabuf->height,
                                      stride, fourcc, false);
-- 
2.18.1

Re: [Qemu-devel] [PATCH 3/3] egl-helpers: add dmabuf modifier support.

[Marc-André Lureau]

Hi

On Wed, May 22, 2019 at 12:04 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Add modifier parameter to egl_get_fd_for_texture(), to return the used
> modifier on dmabuf exports.

But nothing uses it yet?

>
> Check and use QemuDmaBuf->modifier in egl_dmabuf_import_texture() for
> dmabuf imports.

That could be a separate patch, or merged with the first patch.

>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  include/ui/egl-helpers.h |  3 ++-
>  ui/egl-helpers.c         | 37 ++++++++++++++++++++++++++-----------
>  ui/spice-display.c       |  7 ++++---
>  3 files changed, 32 insertions(+), 15 deletions(-)
>
> diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
> index b976cb872821..d71412779913 100644
> --- a/include/ui/egl-helpers.h
> +++ b/include/ui/egl-helpers.h
> @@ -36,7 +36,8 @@ extern struct gbm_device *qemu_egl_rn_gbm_dev;
>  extern EGLContext qemu_egl_rn_ctx;
>
>  int egl_rendernode_init(const char *rendernode, DisplayGLMode mode);
> -int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc);
> +int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc,
> +                           EGLuint64KHR *modifier);
>
>  void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf);
>  void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf);
> diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
> index e90eef8c9c3a..87bfd32e8ddb 100644
> --- a/ui/egl-helpers.c
> +++ b/ui/egl-helpers.c
> @@ -200,7 +200,8 @@ err:
>      return -1;
>  }
>
> -int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
> +int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc,
> +                           EGLuint64KHR *modifier)
>  {
>      EGLImageKHR image;
>      EGLint num_planes, fd;
> @@ -214,7 +215,7 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
>      }
>
>      eglExportDMABUFImageQueryMESA(qemu_egl_display, image, fourcc,
> -                                  &num_planes, NULL);
> +                                  &num_planes, modifier);
>      if (num_planes != 1) {
>          eglDestroyImageKHR(qemu_egl_display, image);
>          return -1;
> @@ -228,20 +229,34 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc)
>  void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf)
>  {
>      EGLImageKHR image = EGL_NO_IMAGE_KHR;
> -    EGLint attrs[] = {
> -        EGL_DMA_BUF_PLANE0_FD_EXT,      dmabuf->fd,
> -        EGL_DMA_BUF_PLANE0_PITCH_EXT,   dmabuf->stride,
> -        EGL_DMA_BUF_PLANE0_OFFSET_EXT,  0,
> -        EGL_WIDTH,                      dmabuf->width,
> -        EGL_HEIGHT,                     dmabuf->height,
> -        EGL_LINUX_DRM_FOURCC_EXT,       dmabuf->fourcc,
> -        EGL_NONE, /* end of list */
> -    };
> +    EGLint attrs[64];
> +    int i = 0;
>
>      if (dmabuf->texture != 0) {
>          return;
>      }
>
> +    attrs[i++] = EGL_WIDTH;
> +    attrs[i++] = dmabuf->width;
> +    attrs[i++] = EGL_HEIGHT;
> +    attrs[i++] = dmabuf->height;
> +    attrs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
> +    attrs[i++] = dmabuf->fourcc;
> +
> +    attrs[i++] = EGL_DMA_BUF_PLANE0_FD_EXT;
> +    attrs[i++] = dmabuf->fd;
> +    attrs[i++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
> +    attrs[i++] = dmabuf->stride;
> +    attrs[i++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
> +    attrs[i++] = 0;
> +    if (dmabuf->modifier) {
> +        attrs[i++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
> +        attrs[i++] = (dmabuf->modifier >>  0) & 0xffffffff;
> +        attrs[i++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
> +        attrs[i++] = (dmabuf->modifier >> 32) & 0xffffffff;
> +    }
> +    attrs[i++] = EGL_NONE;
> +
>      image = eglCreateImageKHR(qemu_egl_display,
>                                EGL_NO_CONTEXT,
>                                EGL_LINUX_DMA_BUF_EXT,
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index a5e26479a866..104df2302575 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -888,7 +888,8 @@ static void spice_gl_switch(DisplayChangeListener *dcl,
>      if (ssd->ds) {
>          surface_gl_create_texture(ssd->gls, ssd->ds);
>          fd = egl_get_fd_for_texture(ssd->ds->texture,
> -                                    &stride, &fourcc);
> +                                    &stride, &fourcc,
> +                                    NULL);
>          if (fd < 0) {
>              surface_gl_destroy_texture(ssd->gls, ssd->ds);
>              return;
> @@ -945,7 +946,7 @@ static void qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl,
>      int fd = -1;
>
>      assert(tex_id);
> -    fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc);
> +    fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc, NULL);
>      if (fd < 0) {
>          fprintf(stderr, "%s: failed to get fd for texture\n", __func__);
>          return;
> @@ -1063,7 +1064,7 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl,
>                  egl_fb_setup_new_tex(&ssd->blit_fb,
>                                       dmabuf->width, dmabuf->height);
>                  fd = egl_get_fd_for_texture(ssd->blit_fb.texture,
> -                                            &stride, &fourcc);
> +                                            &stride, &fourcc, NULL);
>                  spice_qxl_gl_scanout(&ssd->qxl, fd,
>                                       dmabuf->width, dmabuf->height,
>                                       stride, fourcc, false);
> --
> 2.18.1
>
>


-- 
Marc-André Lureau

Re: [Qemu-devel] [PATCH 3/3] egl-helpers: add dmabuf modifier support.

[Gerd Hoffmann]

On Wed, May 22, 2019 at 12:47:47PM +0200, Marc-André Lureau wrote:
> Hi
> 
> On Wed, May 22, 2019 at 12:04 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > Add modifier parameter to egl_get_fd_for_texture(), to return the used
> > modifier on dmabuf exports.
> 
> But nothing uses it yet?

WIP still.  Sneak preview:
  https://git.kraxel.org/cgit/qemu/log/?h=sirius/display-drm

> > Check and use QemuDmaBuf->modifier in egl_dmabuf_import_texture() for
> > dmabuf imports.
> 
> That could be a separate patch, or merged with the first patch.

Ok, I'll split it.

cheers,
  Gerd