drm-lease-manager: Rebase agl-compositor support patch

Rebase the patch so that it can be applied to the latest
mainline code.

Bug-AGL: SPEC-4297

Change-Id: Ib0e413e6aa8e9079a8a2ab8af1ec2691ec00308e
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>

diff --git a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch
index e199d0f..02742ff 100644 (file)
--- a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch
+++ b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch
@@ -1,6 +1,6 @@
-From 31ee2e33899d09610b30ac0671b2c700104fbe8f Mon Sep 17 00:00:00 2001
+From c2ea6f3104035307aec0dcc5db62bbacfc2a6790 Mon Sep 17 00:00:00 2001
 From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
-Date: Tue, 1 Mar 2022 15:39:42 +0900
+Date: Tue, 12 Apr 2022 15:12:27 +0900
 Subject: [PATCH] Add drm-lease support
 
 Add an option to use a DRM lease instead of a DRM device
@@ -21,7 +21,7 @@ Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
  create mode 100644 src/drm-lease.h
 
 diff --git a/meson.build b/meson.build
-index bc8961d..67a6d5e 100644
+index 5f6c29d..159e1f4 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -194,6 +194,12 @@ elif policy_to_install == 'rba'
@@ -53,7 +53,7 @@ index dd1f3c0..89de273 100644
 +      description: 'Support for running weston with a leased DRM Master'
 +)
 diff --git a/src/compositor.c b/src/compositor.c
-index 2bbdce8..0289594 100644
+index 9a3a825..5fa459d 100644
 --- a/src/compositor.c
 +++ b/src/compositor.c
 @@ -64,6 +64,8 @@
@@ -95,14 +95,14 @@ index 2bbdce8..0289594 100644
        return ret;
  }
  
-@@ -1768,6 +1774,7 @@ int wet_main(int argc, char *argv[])
-       wl_display_destroy_clients(display);
+@@ -1774,6 +1780,7 @@ error_compositor:
+       free(modules);
+       modules = NULL;
  
- error_compositor:
 +      release_drm_lease(ivi.drm_lease);
-       weston_compositor_tear_down(ivi.compositor);
+       weston_compositor_destroy(ivi.compositor);
  
-       weston_compositor_log_scope_destroy(log_scope);
+       weston_log_scope_destroy(log_scope);
 diff --git a/src/drm-lease.c b/src/drm-lease.c
 new file mode 100644
 index 0000000..887277d