From patchwork Fri Feb 9 18:56:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Etheridge, Darren" X-Patchwork-Id: 39138 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 561DCC4828F for ; Fri, 9 Feb 2024 18:56:48 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.20646.1707505005584270318 for ; Fri, 09 Feb 2024 10:56:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=hRbQU2bm; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: detheridge@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 419Iuivs058201; Fri, 9 Feb 2024 12:56:44 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1707505004; bh=7pU5LRKzLwop+pfb5lSnmcmOKcaj4JC7BU4UzgqSUdQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=hRbQU2bmmdZXbkJzvuvGoTsz5HrqPHzsaBPexz5KyuttCTeCbYFEGSxpoAYCBObtE wkKVRWJohclgj4C3/xZHerA2Oj9MI6fdqUWgHWpJguTJ4RR0L4zffCzcs4zNF5k5uL 2KL/ClR/OpW9LLYlvcbI2YKyzrtIRrgKzq+O4Ad4= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 419IuifB119675 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 9 Feb 2024 12:56:44 -0600 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 9 Feb 2024 12:56:44 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 9 Feb 2024 12:56:44 -0600 Received: from uda0867391.dal.design.ti.com (uda0867391.dhcp.ti.com [128.247.81.32]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 419IugLe047828; Fri, 9 Feb 2024 12:56:44 -0600 From: To: , , CC: , Subject: [meta-arago][kirkstone][PATCHv2 1/4] meta-arago: distro: chromium: remove old dynamic layer Date: Fri, 9 Feb 2024 12:56:32 -0600 Message-ID: <20240209185635.32675-2-detheridge@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20240209185635.32675-1-detheridge@ti.com> References: <20240209185635.32675-1-detheridge@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Feb 2024 18:56:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15155 From: Darren Etheridge Cleaning up left over chromium stuff that I suspect won't even build with kirkstone. The meta-browser layer has moved on considerably and my next patches will replace this with GPU support on IMG Rogue based GPU devices within Chromium v111. Signed-off-by: Darren Etheridge --- meta-arago-distro/conf/layer.conf | 2 - .../chromium-75.0.3770.80-SIOCGSTAMP.patch | 15 ------ .../chromium-ozone-wayland/pulse.patch | 47 ------------------- .../chromium-ozone-wayland_%.bbappend | 8 ---- 4 files changed, 72 deletions(-) delete mode 100644 meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/chromium-75.0.3770.80-SIOCGSTAMP.patch delete mode 100644 meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/pulse.patch delete mode 100644 meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf index cf6ccbec..40b0f5bb 100644 --- a/meta-arago-distro/conf/layer.conf +++ b/meta-arago-distro/conf/layer.conf @@ -24,11 +24,9 @@ LAYERDEPENDS_meta-arago-distro = " \ # clang-layer LAYERRECOMMENDS_meta-arago-distro = " \ - browser-layer \ " BBFILES_DYNAMIC += " \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/recipes*/*/*.bbappend \ " BB_DANGLINGAPPENDS_WARNONLY = "true" diff --git a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/chromium-75.0.3770.80-SIOCGSTAMP.patch b/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/chromium-75.0.3770.80-SIOCGSTAMP.patch deleted file mode 100644 index 0ef1e7f1..00000000 --- a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/chromium-75.0.3770.80-SIOCGSTAMP.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h ---- chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP 2019-06-06 10:04:57.050403639 -0400 -+++ chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h 2019-06-06 10:06:03.975121688 -0400 -@@ -16,6 +16,11 @@ - #define WEBRTC_USE_EPOLL 1 - #endif - -+// for SIOCGSTAMP in Linux 5.2 -+#if defined(WEBRTC_LINUX) -+#include -+#endif -+ - #include - #include - #include diff --git a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/pulse.patch b/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/pulse.patch deleted file mode 100644 index d88220b3..00000000 --- a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland/pulse.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -pNur chromium-77.0.3865.75-orig/media/audio/pulse/pulse.sigs chromium-77.0.3865.75/media/audio/pulse/pulse.sigs ---- chromium-77.0.3865.75-orig/media/audio/pulse/pulse.sigs 2019-09-09 23:55:20.000000000 +0200 -+++ chromium-77.0.3865.75/media/audio/pulse/pulse.sigs 2019-09-20 20:37:43.872670594 +0200 -@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info - pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); - pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); - pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); --pa_context_state_t pa_context_get_state(pa_context* c); -+pa_context_state_t pa_context_get_state(const pa_context* c); - pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); - pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); - void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); --pa_operation_state_t pa_operation_get_state(pa_operation* o); -+pa_operation_state_t pa_operation_get_state(const pa_operation* o); - void pa_context_unref(pa_context* c); - void pa_operation_unref(pa_operation* o); - int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); -@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* - int pa_stream_disconnect(pa_stream* s); - int pa_stream_drop(pa_stream *p); - pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); --uint32_t pa_stream_get_device_index(pa_stream* s); -+uint32_t pa_stream_get_device_index(const pa_stream* s); - int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); --pa_stream_state_t pa_stream_get_state(pa_stream* p); -+pa_stream_state_t pa_stream_get_state(const pa_stream* p); - pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); - pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); - pa_proplist* pa_proplist_new(void); --int pa_proplist_contains(pa_proplist* p, const char* key); -+int pa_proplist_contains(const pa_proplist* p, const char* key); - void pa_proplist_free(pa_proplist* p); --const char* pa_proplist_gets(pa_proplist* p, const char* key); -+const char* pa_proplist_gets(const pa_proplist* p, const char* key); - int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); --size_t pa_stream_readable_size(pa_stream *p); -+size_t pa_stream_readable_size(const pa_stream *p); - int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); - void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); - void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); - int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); - void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); - void pa_stream_unref(pa_stream* s); --int pa_context_errno(pa_context *c); -+int pa_context_errno(const pa_context *c); - const char* pa_strerror(int error); - pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); diff --git a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend b/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend deleted file mode 100644 index 13ac6464..00000000 --- a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -PR:append = ".arago0" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -DEPENDS:remove = "virtual/libgl" - -SRC_URI += "file://chromium-75.0.3770.80-SIOCGSTAMP.patch" -SRC_URI += "file://pulse.patch" From patchwork Fri Feb 9 18:56:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Etheridge, Darren" X-Patchwork-Id: 39137 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BC24C4829E for ; Fri, 9 Feb 2024 18:56:48 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.20648.1707505006879868740 for ; Fri, 09 Feb 2024 10:56:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Sj+gCrMS; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: detheridge@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 419IujT6101584; Fri, 9 Feb 2024 12:56:45 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1707505005; bh=YAZikSfxOLRXjwMhs0NEXhdg60owKesNQm2k4gCRb5M=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Sj+gCrMS/FR5HKG9t2Gd5M+2hmV7e35kjp95mkjyo01VPLxsi4Vu9rX2we9qG0cdp CPNjhnPjWxBViVIVKfH3APWvW+eDcipcqeeNw0et8IMFkryvyDBfBjzCGUSt02TtCV Nkqs9u0liX7IA8lBdlAqIh/zesKAvht4OapFgOLo= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 419Iujk7010361 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 9 Feb 2024 12:56:45 -0600 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 9 Feb 2024 12:56:45 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 9 Feb 2024 12:56:45 -0600 Received: from uda0867391.dal.design.ti.com (uda0867391.dhcp.ti.com [128.247.81.32]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 419IugLf047828; Fri, 9 Feb 2024 12:56:45 -0600 From: To: , , CC: , Subject: [meta-arago][kirkstone][PATCHv2 2/4] meta-arago: distro: add a bbappend to patch the chromium browser Date: Fri, 9 Feb 2024 12:56:33 -0600 Message-ID: <20240209185635.32675-3-detheridge@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20240209185635.32675-1-detheridge@ti.com> References: <20240209185635.32675-1-detheridge@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Feb 2024 18:56:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15156 From: Darren Etheridge This applies a patch for meta-browser/chromium-ozone-wayland to make the sandboxing work with the Imagination GPU components without the need for the --no-sandbox flag. GPU acceleration in Chromium is dependant on IMG DDK 23.3. It works across AXE/BXS/8XE GPU's. No acceleration is expected for SGX. Also add an upstream patch to stop Chromium from segfaulting when it is run with no input devices connected to the board. Patch was retrieved from: https://chromium.googlesource.com/chromium/src/+/323077958301bc321d840a2c2b983ab469934753 Signed-off-by: Darren Etheridge --- v2 Fixed typo on bbappend in subject meta-arago-distro/conf/layer.conf | 2 + ...omium-ozone-wayland_111.0.5563.64.bbappend | 8 ++ ...dbox-allow-access-to-PowerVR-GPU-fro.patch | 74 +++++++++++++++++++ ...-chromium-32307795-fix-nullprt-deref.patch | 52 +++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64.bbappend create mode 100644 meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0001-chromium-gpu-sandbox-allow-access-to-PowerVR-GPU-fro.patch create mode 100644 meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0002-upstream-chromium-32307795-fix-nullprt-deref.patch diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf index 40b0f5bb..b0221860 100644 --- a/meta-arago-distro/conf/layer.conf +++ b/meta-arago-distro/conf/layer.conf @@ -24,9 +24,11 @@ LAYERDEPENDS_meta-arago-distro = " \ # clang-layer LAYERRECOMMENDS_meta-arago-distro = " \ + chromium-browser-layer \ " BBFILES_DYNAMIC += " \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes*/*/*.bbappend \ " BB_DANGLINGAPPENDS_WARNONLY = "true" diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64.bbappend b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64.bbappend new file mode 100644 index 00000000..df93e26b --- /dev/null +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64.bbappend @@ -0,0 +1,8 @@ +PR:append = ".arago0" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}_${PV}:" + +SRC_URI:append = " \ + file://0001-chromium-gpu-sandbox-allow-access-to-PowerVR-GPU-fro.patch \ + file://0002-upstream-chromium-32307795-fix-nullprt-deref.patch \ + " diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0001-chromium-gpu-sandbox-allow-access-to-PowerVR-GPU-fro.patch b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0001-chromium-gpu-sandbox-allow-access-to-PowerVR-GPU-fro.patch new file mode 100644 index 00000000..1930f976 --- /dev/null +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0001-chromium-gpu-sandbox-allow-access-to-PowerVR-GPU-fro.patch @@ -0,0 +1,74 @@ +From 11267fe76f81dce283d565d517b679aa2be44466 Mon Sep 17 00:00:00 2001 +From: Darren Etheridge +Date: Fri, 26 Jan 2024 10:54:49 -0600 +Subject: [PATCH] chromium: gpu: sandbox: allow access to PowerVR GPU from + sandbox + +Chromium runs in a sandbox to limit access to the system, however +the PowerVR drivers for the Imagination GPU used on TI hardware need +some extra libraries along with the DRM device nodes to be opened up. +This patch opens up the necessary pieces. + +Signed-off-by: Darren Etheridge +--- + content/gpu/gpu_sandbox_hook_linux.cc | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/content/gpu/gpu_sandbox_hook_linux.cc b/content/gpu/gpu_sandbox_hook_linux.cc +index d93285a..1f8aafd 100644 +--- a/content/gpu/gpu_sandbox_hook_linux.cc ++++ b/content/gpu/gpu_sandbox_hook_linux.cc +@@ -67,6 +67,11 @@ inline bool UseChromecastSandboxAllowlist() { + #endif + } + ++inline bool IsGPUIMGRogue() { ++ return true; ++} ++ ++ + inline bool IsArchitectureArm() { + #if defined(ARCH_CPU_ARM_FAMILY) + return true; +@@ -441,6 +446,11 @@ std::vector FilePermissionsForGpu( + + AddVulkanICDPermissions(&permissions); + ++ if (IsGPUIMGRogue()) { ++ // Add standard DRM permissions for snapdragon/PowerVR: ++ AddDrmGpuPermissions(&permissions); ++ } ++ + if (IsChromeOS()) { + // Permissions are additive, there can be multiple GPUs in the system. + AddStandardChromeOsPermissions(&permissions); +@@ -508,6 +518,8 @@ void LoadArmGpuLibraries() { + DRI_DRIVER_DIR "/mediatek_dri.so", + DRI_DRIVER_DIR "/rockchip_dri.so", + DRI_DRIVER_DIR "/asahi_dri.so", ++ DRI_DRIVER_DIR "/pvr_dri.so", ++ DRI_DRIVER_DIR "/tidss_dri.so", + #else + "/usr/lib64/dri/msm_dri.so", + "/usr/lib64/dri/panfrost_dri.so", +@@ -515,6 +527,8 @@ void LoadArmGpuLibraries() { + "/usr/lib64/dri/rockchip_dri.so", + "/usr/lib64/dri/asahi_dri.so", + "/usr/lib/dri/msm_dri.so", ++ "/usr/lib/dri/tidss_dri.so", ++ "/usr/lib/dri/pvr_dri.so", + "/usr/lib/dri/panfrost_dri.so", + "/usr/lib/dri/mediatek_dri.so", + "/usr/lib/dri/rockchip_dri.so", +@@ -632,7 +646,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( + command_set.set(sandbox::syscall_broker::COMMAND_ACCESS); + command_set.set(sandbox::syscall_broker::COMMAND_OPEN); + command_set.set(sandbox::syscall_broker::COMMAND_STAT); +- if (IsChromeOS() && ++ if ((IsGPUIMGRogue() || IsChromeOS()) && + (options.use_amd_specific_policies || + options.use_intel_specific_policies || + options.use_virtio_specific_policies || IsArchitectureArm())) { +-- +2.36.1 + diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0002-upstream-chromium-32307795-fix-nullprt-deref.patch b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0002-upstream-chromium-32307795-fix-nullprt-deref.patch new file mode 100644 index 00000000..5624de96 --- /dev/null +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64/0002-upstream-chromium-32307795-fix-nullprt-deref.patch @@ -0,0 +1,52 @@ +From 323077958301bc321d840a2c2b983ab469934753 Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Wed, 02 Aug 2023 15:46:56 +0000 +Subject: [PATCH] ozone/wayland: Fix nullptr deref in WaylandWindowManager + +When no input devices are available (e.g. embedded devices), +`connection_->window_drag_controller()` returns nullptr. Add a check to +ensure we don't accidentally dereference that. + +See also https://github.com/OSSystems/meta-browser/issues/736. + +Bug: 578890 +Change-Id: I472d0dfabfea6b4d072ede98c8593370524f54f0 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4724882 +Reviewed-by: Antonio Gomes +Commit-Queue: Max Ihlenfeldt +Cr-Commit-Position: refs/heads/main@{#1178426} +--- + +diff --git a/ui/ozone/platform/wayland/host/wayland_window_manager.cc b/ui/ozone/platform/wayland/host/wayland_window_manager.cc +index e4a8e4541..24999725 100644 +--- a/ui/ozone/platform/wayland/host/wayland_window_manager.cc ++++ b/ui/ozone/platform/wayland/host/wayland_window_manager.cc +@@ -96,15 +96,19 @@ + + WaylandWindow* WaylandWindowManager::GetCurrentPointerOrTouchFocusedWindow() + const { +- // In case there is an ongoing window dragging session, favor the window +- // according to the active drag source. +- // +- // TODO(https://crbug.com/1317063): Apply the same logic to data drag sessions +- // too? +- if (auto drag_source = connection_->window_drag_controller()->drag_source()) { +- return *drag_source == mojom::DragEventSource::kMouse +- ? GetCurrentPointerFocusedWindow() +- : GetCurrentTouchFocusedWindow(); ++ // Might be nullptr if no input devices are available. ++ if (connection_->window_drag_controller()) { ++ // In case there is an ongoing window dragging session, favor the window ++ // according to the active drag source. ++ // ++ // TODO(https://crbug.com/1317063): Apply the same logic to data drag ++ // sessions too? ++ if (auto drag_source = ++ connection_->window_drag_controller()->drag_source()) { ++ return *drag_source == mojom::DragEventSource::kMouse ++ ? GetCurrentPointerFocusedWindow() ++ : GetCurrentTouchFocusedWindow(); ++ } + } + + for (const auto& entry : window_map_) { From patchwork Fri Feb 9 18:56:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Etheridge, Darren" X-Patchwork-Id: 39140 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 219B6C4828F for ; Fri, 9 Feb 2024 18:56:58 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.20182.1707505008024840382 for ; Fri, 09 Feb 2024 10:56:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=OOEE06Tq; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: detheridge@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 419Iukxc130065; Fri, 9 Feb 2024 12:56:46 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1707505006; bh=OToOtTFN8hs7mi+lB3XDWKtqXQCv0WD2lqVGwSLOXf0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OOEE06TqKFxHmhOkGtVyMyLXRTjDSz8HbKzXDKLp1HjNX77aAcK9FvAynE9CgM81i rUtrqGrEwejF1cV0a26eHcse9kz9q9y8sFocb7SheN0wdjNIng95c262ao/Ig2+Mp0 dduMoIooE4y3SWWkZHRNFRdux3QlfxmETLRsNkUY= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 419Iukq6108035 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 9 Feb 2024 12:56:46 -0600 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 9 Feb 2024 12:56:46 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 9 Feb 2024 12:56:46 -0600 Received: from uda0867391.dal.design.ti.com (uda0867391.dhcp.ti.com [128.247.81.32]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 419IugLg047828; Fri, 9 Feb 2024 12:56:46 -0600 From: To: , , CC: , Subject: [meta-arago][kirkstone][PATCHv2 3/4] meta-arago: images: update tisdk-default-image to include chromium Date: Fri, 9 Feb 2024 12:56:34 -0600 Message-ID: <20240209185635.32675-4-detheridge@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20240209185635.32675-1-detheridge@ti.com> References: <20240209185635.32675-1-detheridge@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Feb 2024 18:56:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15157 From: Darren Etheridge If the chromium-browser-layer is detected, then add chromium-ozone-wayland into the default image. If the layer is detected then append chromium-ozone-wayland to the IMAGE_INSTALL variable. This increases the build time and image size which is why we make this conditional on the browser layer being present. Signed-off-by: Darren Etheridge --- .../recipes-core/images/tisdk-default-image.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend new file mode 100644 index 00000000..7224fe72 --- /dev/null +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend @@ -0,0 +1,3 @@ +PR:append = ".chromium0" + +IMAGE_INSTALL:append = " chromium-ozone-wayland" From patchwork Fri Feb 9 18:56:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Etheridge, Darren" X-Patchwork-Id: 39139 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28F1DC4829C for ; Fri, 9 Feb 2024 18:56:58 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.20650.1707505009284982284 for ; Fri, 09 Feb 2024 10:56:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=iiAepOCk; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: detheridge@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 419Iumhv058208; Fri, 9 Feb 2024 12:56:48 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1707505008; bh=qLFd/TdBAzqg5zbj0Xe337LKol8c+cCRhgMFy8oMcAQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=iiAepOCkTQnqOh/nMtSLqm8lRHmXM2rsS01aqHvd0MIwOmhXwBve9j/ENto0MSo+n QRu/0I98+tz02ES2auyACdN9BwWK6TxeytlQwgx0Jbr2QpMx5oVsgYWMfRuTgKjVlS T29hW5PIq42maZbasSs4u79Vgge3Mx1cNX7LFuxA= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 419Iumu4107036 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 9 Feb 2024 12:56:48 -0600 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 9 Feb 2024 12:56:47 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 9 Feb 2024 12:56:47 -0600 Received: from uda0867391.dal.design.ti.com (uda0867391.dhcp.ti.com [128.247.81.32]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 419IugLh047828; Fri, 9 Feb 2024 12:56:47 -0600 From: To: , , CC: , Subject: [meta-arago][kirkstone][PATCHv2 4/4] meta-arago: tisdk-default-image: remove old chromium logic Date: Fri, 9 Feb 2024 12:56:35 -0600 Message-ID: <20240209185635.32675-5-detheridge@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20240209185635.32675-1-detheridge@ti.com> References: <20240209185635.32675-1-detheridge@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Feb 2024 18:56:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15158 From: Darren Etheridge The new dynamic meta-chromium-browser layer will do this same thing and add chromium-ozone-wayland into the image if the layer is detected. This is a hangover from dunfell and doesn't serve any purpose in kirkstone so removing to uncomplicate things. Signed-off-by: Darren Etheridge --- .../recipes-core/images/tisdk-default-image.bb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index 7761ac34..9c3446f3 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -39,15 +39,6 @@ export IMAGE_BASENAME = "tisdk-default-image" # available on the HW. IMAGE_FSTYPES:remove:omapl138 = "ubifs ubi" -# Below is the delta in packages between old fuller and a new smaller default rootfs -CHROMIUM = "" -CHROMIUM:append:omap-a15 = "\ - chromium-ozone-wayland \ -" -CHROMIUM:append:k3 = "\ - chromium-ozone-wayland \ -" - EXTRABROWSERS = " \ qtwebbrowser-examples \ qtwebengine-qmlplugins \ @@ -56,7 +47,6 @@ EXTRABROWSERS = " \ PYTHON2APPS = " \ ${@bb.utils.contains('DISTRO_FEATURES','opengl',"${EXTRABROWSERS}",'',d)} \ - ${@bb.utils.contains("BBFILE_COLLECTIONS","browser-layer",bb.utils.contains('DISTRO_FEATURES','wayland',"${CHROMIUM}",'',d),'',d)} \ " DEVTOOLS = " \