gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From 5a0a17bc0dafe577ec02ad2205c25bc8acb2c5e6 Mon Sep 17 00:00:00 2001
   2 From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
   3 Date: Mon, 25 Oct 2021 18:26:34 +0900
   4 Subject: [PATCH 1/3] waylandws_client: Ensure that supported DMAbuf formats
   5  are received
   6
   7 Explicitly check that the list of supported dmabuf formats have
   8 been received from the server during initialization.  At least
   9 one pixel format must be supported in order to complete initialization
  10 successfully.
  11 ---
  12  src/waylandws_client.c | 20 ++++++++++++++++++++
  13  1 file changed, 20 insertions(+)
  14
  15 diff --git a/src/waylandws_client.c b/src/waylandws_client.c
  16 index e917347..20bfac9 100644
  17 --- a/src/waylandws_client.c
  18 +++ b/src/waylandws_client.c
  19 @@ -698,6 +698,20 @@ static bool setup_buffer_sharing(WLWSClientDisplay *display)
  20         return authenticate_kms_device(display);
  21  }
  22
  23 +static bool ensure_supported_dmabuf_formats(WLWSClientDisplay *display)
  24 +{
  25 +       if (!display->zlinux_dmabuf)
  26 +               return true;
  27 +
  28 +       if (wl_display_roundtrip_queue(display->wl_display, display->wl_queue) < 0 ||
  29 +            !display->enable_formats) {
  30 +               /* No supported dmabuf pixel formats */
  31 +               return false;
  32 +       }
  33 +
  34 +       return true;
  35 +}
  36 +
  37  /***********************************************************************************
  38   Function Name      : WSEGL_InitialiseDisplay
  39   Inputs             : hNativeDisplay
  40 @@ -755,6 +769,12 @@ static WSEGLError WSEGLc_InitialiseDisplay(NativeDisplayType hNativeDisplay,
  41                 goto fail;
  42         }
  43
  44 +       /* Get the list of supported pixel formats */
  45 +       if (!ensure_supported_dmabuf_formats(display)) {
  46 +               err = WSEGL_BAD_NATIVE_DISPLAY;
  47 +               goto fail;
  48 +       }
  49 +
  50         /* XXX: should we wrap this with wl_kms client code? */
  51         if (kms_create(display->fd, &display->kms)) {
  52                 err = WSEGL_BAD_NATIVE_DISPLAY;
  53 --
  54 2.25.1
  55