commit f1cee11437d33b398f68cf931a14d6c41a97319f
author John Stultz <john.stultz@linaro.org> Fri Sep 18 20:54:06 2020 +0000
committer Caleb Connolly <caleb@connolly.tech> Fri Aug 06 16:41:06 2021 +0100
tree ad6e3897a305f28cb723dae34771b454f236bd58
parent d93042c0f457eb6fc3a64b12499787f87bef4bce

db845c: Switch gralloc to use gralloc.minigbm_msm instead of gralloc_gbm

Instead of carying our own copy of gralloc_gbm, try to utilize
the minigbm gralloc as it implements gralloc4

Change-Id: I628ff76d3ef7cf441b122bc6f2e49f662b0c7ed5
Signed-off-by: John Stultz <john.stultz@linaro.org>

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index a5483fe..9cfc24a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -41,22 +41,31 @@
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
-    android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.allocator@2.0-service \
-    android.hardware.graphics.composer@2.2-impl \
-    android.hardware.graphics.composer@2.2-service \
-    android.hardware.graphics.mapper@2.0-impl-2.1 \
-    gralloc.gbm \
-    hwcomposer.drm \
     libGLES_mesa
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.gralloc=gbm \
+    ro.hardware.gralloc=minigbm_msm \
     ro.hardware.hwcomposer=drm \
     debug.sf.no_hw_vsync=1 \
     ro.sf.lcd_density=400 \
     ro.opengles.version=196609
 
+#
+# Hardware Composer HAL
+#
+PRODUCT_PACKAGES += \
+    hwcomposer.drm \
+    android.hardware.graphics.composer@2.3-impl \
+    android.hardware.graphics.composer@2.3-service
+
+#
+# Gralloc HAL
+#
+PRODUCT_PACKAGES += \
+    gralloc.minigbm_msm \
+    android.hardware.graphics.allocator@4.0-service.minigbm_msm \
+    android.hardware.graphics.mapper@4.0-impl.minigbm_msm
+
 # Use Launcher3QuickStep
 PRODUCT_PACKAGES += Launcher3QuickStep