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

   1 From 10fcfd66069c774e28f67b18afd329e4bcf9f5b3 Mon Sep 17 00:00:00 2001
   2 From: Ray Smith <rsmith@brightsign.biz>
   3 Date: Tue, 19 Dec 2023 11:45:45 +0000
   4 Subject: [PATCH 2/2] backend-drm: always create gem_handle_refcnt hash table
   5
   6 Devices created via drm_device_create have this hash table, but those
   7 created via drm_backend_create don't.
   8
   9 Signed-off-by: Ray Smith <rsmith@brightsign.biz>
  10 Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/e7960048]
  11 ---
  12  libweston/backend-drm/drm.c | 12 +++++++++---
  13  1 file changed, 9 insertions(+), 3 deletions(-)
  14
  15 diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
  16 index fcececb..9d6a9cf 100644
  17 --- a/libweston/backend-drm/drm.c
  18 +++ b/libweston/backend-drm/drm.c
  19 @@ -3364,8 +3364,7 @@ drm_destroy(struct weston_backend *backend)
  20         weston_launcher_close(ec->launcher, device->drm.fd);
  21         weston_launcher_destroy(ec->launcher);
  22
  23 -       if (device->gem_handle_refcnt)
  24 -               hash_table_destroy(device->gem_handle_refcnt);
  25 +       hash_table_destroy(device->gem_handle_refcnt);
  26
  27         free(device->drm.filename);
  28         free(device);
  29 @@ -3867,10 +3866,13 @@ drm_backend_create(struct weston_compositor *compositor,
  30
  31         device = zalloc(sizeof *device);
  32         if (device == NULL)
  33 -               return NULL;
  34 +               goto err_backend;
  35         device->state_invalid = true;
  36         device->drm.fd = -1;
  37         device->backend = b;
  38 +       device->gem_handle_refcnt = hash_table_create();
  39 +       if (!device->gem_handle_refcnt)
  40 +               goto err_device;
  41
  42         b->drm = device;
  43         wl_list_init(&b->kms_list);
  44 @@ -4108,6 +4110,10 @@ err_compositor:
  45         if (b->gbm)
  46                 gbm_device_destroy(b->gbm);
  47  #endif
  48 +       hash_table_destroy(device->gem_handle_refcnt);
  49 +err_device:
  50 +       free(device);
  51 +err_backend:
  52         free(b);
  53         return NULL;
  54  }
  55 --
  56 2.43.0
  57