Revert "Switch back from DMABUF to ION/BLOB allocator"
This reverts commit f35c9cb038ad0c25bde64a03aeb78fe209522837.
To enable DMABUF again.
Patch: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1634146/
fixed the error when using DMABUF
Bug: 153786620
Test: reboot O6 device and confirm the error does not show up again
Change-Id: Id378fe1fe8b9615f72138575cec8e5e1e20caec9
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ba699b3..550bb8f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -171,7 +171,7 @@
BOARD_USE_DEC_SW_CSC := true
BOARD_USE_ENC_SW_CSC := true
BOARD_SUPPORT_MFC_ENC_RGB := true
-BOARD_USE_BLOB_ALLOCATOR := true
+BOARD_USE_BLOB_ALLOCATOR := false
########################
BOARD_SUPER_PARTITION_SIZE := 8531214336
diff --git a/conf/ueventd.gs101.rc b/conf/ueventd.gs101.rc
index 9588dff..f85b24b 100644
--- a/conf/ueventd.gs101.rc
+++ b/conf/ueventd.gs101.rc
@@ -190,9 +190,9 @@
/dev/dma_heap/farawimg-secure 0444 system graphics
/dev/dma_heap/tui 0444 system graphics
/dev/dma_heap/tui-uncached 0444 system graphics
-/dev/dma_heap/vframe-secure 0444 system graphics
-/dev/dma_heap/video_system 0444 system graphics
-/dev/dma_heap/video_system-uncached 0444 system graphics
+/dev/dma_heap/vframe-secure 0444 system drmrpc
+/dev/dma_heap/video_system 0444 system drmrpc
+/dev/dma_heap/video_system-uncached 0444 system drmrpc
/dev/dma_heap/vscaler-secure 0444 system graphics
-/dev/dma_heap/vstream-secure 0444 system graphics
+/dev/dma_heap/vstream-secure 0444 system drmrpc
/dev/dma_heap/sensor_direct_heap 0444 system graphics
diff --git a/device.mk b/device.mk
index ff421da..97922d2 100644
--- a/device.mk
+++ b/device.mk
@@ -700,6 +700,9 @@
libExynosC2Vp9Dec \
libExynosC2Vp9Enc
+PRODUCT_PROPERTY_OVERRIDES += \
+ debug.c2.use_dmabufheaps=1
+
# 2. OpenMAX IL
PRODUCT_COPY_FILES += \
device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \