Skip to content

Commit

Permalink
Migrate to AOSPv14
Browse files Browse the repository at this point in the history
HVUI/Vulkan does not work on A14 yet. Reverted to GLES.

Signed-off-by: Roman Stratiienko <[email protected]>
  • Loading branch information
rsglobal committed Oct 19, 2023
1 parent c5a2a37 commit ce45f94
Show file tree
Hide file tree
Showing 19 changed files with 1,137 additions and 115 deletions.
2 changes: 1 addition & 1 deletion aosptree/vendor/devices-community/gd_rpi4/device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.vulkan=broadcom \

# Enable Vulkan backend for SKIA/HWUI
TARGET_USES_VULKAN = true
# TARGET_USES_VULKAN = true

# Bluetooth
PRODUCT_VENDOR_PROPERTIES += \
Expand Down
2 changes: 1 addition & 1 deletion manifests/glodroid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- gpu+display components (vendor) -->
<project path="glodroid/vendor/minigbm" remote="aosp" name="platform/external/minigbm" groups="glodroid" revision="84b3a09ef0e620c1b2ec19c7626c327e68a847bc" />
<project path="glodroid/vendor/drm_hwcomposer" remote="aosp" name="platform/external/drm_hwcomposer" groups="glodroid" revision="5de61b5e4fbf43b78b605dab68465aa6722930c4" />
<project path="glodroid/vendor/mesa3d" remote="aosp" name="platform/external/mesa3d" groups="glodroid" revision="f88338f80127d8bbbb49269e2399fd9e7e460c5c" />
<project path="glodroid/vendor/mesa3d" remote="aosp" name="platform/external/mesa3d" groups="glodroid" revision="9b0960cfe39414815b1dc5a786e6312639f49352" />

<!-- camera components (vendor) -->
<project path="glodroid/vendor/libcamera" remote="libcamera" name="libcamera.git" groups="glodroid" revision="960d0c1e19feaf310321c906e14bd5410c6be629" />
Expand Down
29 changes: 0 additions & 29 deletions patches-aosp/build/soong/0001-GLODROID-Don-t-use-clang-tidy.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 2be0dae3f8fb3c912edb49dba2f2cd434b8d9401 Mon Sep 17 00:00:00 2001
From: Roman Stratiienko <[email protected]>
Date: Thu, 19 Oct 2023 03:37:01 +0300
Subject: [PATCH] HWUI: Fix deadlock in graphics pipeline

Mutex lock() causes deadlock when the queue is empty.
Regression is caused by b013c8dee3b3e897b3557206f2d6c75b8c9f2f84
For some unknown reason, it is reproduced only on GloDroid :)
So probably some other part of GD is to blame.
Or, it is just a coincidence.

TODO: Do one more investigation attempt.

Change-Id: Ic981947babe62b83032e9ba1630cc0458c228f44
Signed-off-by: Roman Stratiienko <[email protected]>
---
libs/hwui/renderthread/CanvasContext.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 16b35ffcabac..a9dde31e83e7 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -586,7 +586,11 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
// not visible to IRenderPipeline much less FrameInfoVisualizer. And since this is
// the thread we're primarily concerned about being responsive, this being too broad
// shouldn't pose a performance issue.
- std::scoped_lock lock(mFrameMetricsReporterMutex);
+
+// Causes deadlock when the queue is empty. Regression is caused by b013c8dee3b3e897b3557206f2d6c75b8c9f2f84
+// For some unknown reason, it is reproduced only on GloDroid :) So probably some other part of GD is to blame. Or, it is just a coincidence.
+// std::scoped_lock lock(mFrameMetricsReporterMutex);
+
drawResult = mRenderPipeline->draw(frame, windowDirty, dirty, mLightGeometry,
&mLayerUpdateQueue, mContentDrawBounds, mOpaque,
mLightInfo, mRenderNodes, &(profiler()), mBufferParams);
--
2.39.2

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index f03b56ad6a..4ab246315a 100644
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_BOOTDELAY=0
+CONFIG_BOOTDELAY=1
--
2.37.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 08bf277bb68ef649949a83eb908a35666dc7fccf Mon Sep 17 00:00:00 2001
From: Roman Stratiienko <[email protected]>
Date: Fri, 6 Oct 2023 22:20:52 +0300
Subject: [PATCH 08/12] base: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
definition

Signed-off-by: Roman Stratiienko <[email protected]>
---
common/base/board.mk | 1 -
1 file changed, 1 deletion(-)

diff --git a/common/base/board.mk b/common/base/board.mk
index 82c4292..73158c5 100644
--- a/common/base/board.mk
+++ b/common/base/board.mk
@@ -97,7 +97,6 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm

# Root image
TARGET_COPY_OUT_ROOT := root
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

BOARD_EXT4_SHARE_DUP_BLOCKS := true

--
2.39.2

Loading

0 comments on commit ce45f94

Please sign in to comment.