diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2024-06-10 13:37:46 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-06-27 15:50:08 +0000 |
| commit | 9aa2c662cb3664ed4f9d13a284c4654d79549d48 (patch) | |
| tree | 6e99496f5a71ac07f963e460a6e02d1e198f7c0d /meta-agl-drm-lease/dynamic-layers | |
| parent | 1e0aba7a5d676ff11a6e2eda1f412172b842dc0e (diff) | |
agl-compositor_git: Add minor fix for DRM leasesalmon_18.90.0salmon/18.90.018.90.0
Missing drm_lease_name would case device fd to return always a negative
integer.
Bug-AG: SPEC-5160
Change-Id: If8cf51c8dab4862f9d00e5265cc4b2b20d3229c3
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Diffstat (limited to 'meta-agl-drm-lease/dynamic-layers')
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor/0001-compositor-Add-missing-drm-lease-name.patch b/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor/0001-compositor-Add-missing-drm-lease-name.patch new file mode 100644 index 00000000..9bcc89f1 --- /dev/null +++ b/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor/0001-compositor-Add-missing-drm-lease-name.patch @@ -0,0 +1,35 @@ +From f2e5939476630add3bf2c9254f72a0b57101f848 Mon Sep 17 00:00:00 2001 +From: Marius Vlad <marius.vlad@collabora.com> +Date: Mon, 10 Jun 2024 12:02:33 +0300 +Subject: [PATCH] compositor: Add missing drm-lease-name + +This was an oversight from commit 7963529fc8e3e, 'Add drm-lease +support', which backported the drm-lease support in the AGL compositor +for next release. + +Without a drm-lease-name, the device_id will be an negative integer +resulting in not using the parameter. This should fix leasing with the +AGL compositor. + +Bug-AGL: SPEC-5160 +Signed-off-by: Marius Vlad <marius.vlad@collabora.com> +Change-Id: I4282c115d2038852f6a56a77ce6ab81f2b8f62b4 +--- + src/compositor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/compositor.c b/src/compositor.c +index 156a0ae..65c61d8 100644 +--- a/src/compositor.c ++++ b/src/compositor.c +@@ -1076,6 +1076,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[], + const struct weston_option options[] = { + { WESTON_OPTION_STRING, "seat", 0, &config.seat_id }, + { WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device }, ++ { WESTON_OPTION_STRING, "drm-lease-name", 0, &drm_lease_name }, + { WESTON_OPTION_BOOLEAN, "current-mode", 0, &use_current_mode }, + { WESTON_OPTION_BOOLEAN, "use-pixman", 0, &force_pixman }, + { WESTON_OPTION_BOOLEAN, "continue-without-input", false, &without_input } +-- +2.43.0 + diff --git a/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor_git.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor_git.bbappend index 3c64ce1f..63138299 100644 --- a/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor_git.bbappend +++ b/meta-agl-drm-lease/dynamic-layers/meta-agl-core/recipes-graphics/agl-compositor/agl-compositor_git.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-Add-drm-lease-support.patch" +SRC_URI += "file://0001-Add-drm-lease-support.patch file://0001-compositor-Add-missing-drm-lease-name.patch" PACKAGECONFIG[drm-lease] = "-Ddrm-lease=true,-Ddrm-lease=false,drm-lease-manager" PACKAGECONFIG:append = " drm-lease" |