summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Hobson-Garcia <dhobsong@igel.co.jp>2022-04-08 12:33:22 +0900
committerDamian Hobson-Garcia <dhobsong@igel.co.jp>2022-04-26 15:37:59 +0900
commitea0d8f2adcdfd8a8d1124b580e414f1c76537ac7 (patch)
tree4047a2579f35c77da03cda232eb9f7eb636dbbe8
parent03fcf8ef48b82be818485f8e5eb1ec9b6088e97f (diff)
drm-lease-manager: Rebase agl-compositor support patch
Changes to agl-compositor in the Marlin 13.0.0 tag break the DRM lease support patch. Rebase the patch to the latest mainline code. Bug-AGL: SPEC-4322 Change-Id: Ib0e413e6aa8e9079a8a2ab8af1ec2691ec00308e Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
-rw-r--r--meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch6
1 files changed, 3 insertions, 3 deletions
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 e199d0f8..b757e904 100644
--- 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
@@ -95,10 +95,10 @@ index 2bbdce8..0289594 100644
return ret;
}
-@@ -1768,6 +1774,7 @@ int wet_main(int argc, char *argv[])
- wl_display_destroy_clients(display);
+@@ -1773,6 +1779,7 @@ error_compositor:
+ free(modules);
+ modules = NULL;
- error_compositor:
+ release_drm_lease(ivi.drm_lease);
weston_compositor_tear_down(ivi.compositor);