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 ---
  11  libweston/backend-drm/drm.c | 12 +++++++++---
  12  1 file changed, 9 insertions(+), 3 deletions(-)
  13
  14 diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
  15 index fcececb..9d6a9cf 100644
  16 --- a/libweston/backend-drm/drm.c
  17 +++ b/libweston/backend-drm/drm.c
  18 @@ -3364,8 +3364,7 @@ drm_destroy(struct weston_backend *backend)
  19         weston_launcher_close(ec->launcher, device->drm.fd);
  20         weston_launcher_destroy(ec->launcher);
  21
  22 -       if (device->gem_handle_refcnt)
  23 -               hash_table_destroy(device->gem_handle_refcnt);
  24 +       hash_table_destroy(device->gem_handle_refcnt);
  25
  26         free(device->drm.filename);
  27         free(device);
  28 @@ -3867,10 +3866,13 @@ drm_backend_create(struct weston_compositor *compositor,
  29
  30         device = zalloc(sizeof *device);
  31         if (device == NULL)
  32 -               return NULL;
  33 +               goto err_backend;
  34         device->state_invalid = true;
  35         device->drm.fd = -1;
  36         device->backend = b;
  37 +       device->gem_handle_refcnt = hash_table_create();
  38 +       if (!device->gem_handle_refcnt)
  39 +               goto err_device;
  40
  41         b->drm = device;
  42         wl_list_init(&b->kms_list);
  43 @@ -4108,6 +4110,10 @@ err_compositor:
  44         if (b->gbm)
  45                 gbm_device_destroy(b->gbm);
  46  #endif
  47 +       hash_table_destroy(device->gem_handle_refcnt);
  48 +err_device:
  49 +       free(device);
  50 +err_backend:
  51         free(b);
  52         return NULL;
  53  }
  54 --
  55 2.43.0
  56