From f35c9cb038ad0c25bde64a03aeb78fe209522837 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Thu, 11 Mar 2021 13:56:46 -0800 Subject: [PATCH] Switch back from DMABUF to ION/BLOB allocator Revert of the following changes: I70af757f5 conf: change a group about dma_heap for video codec Id4fc2f04b uses dmabufheap on codec2 I090f0491f disable to use BLOB allocator Bug: 182312949 Test: boot without DMABUF failures Change-Id: Ibeb05a1341c15a206b8c1d2b9c9765769f6472e1 --- BoardConfig-common.mk | 2 +- conf/ueventd.gs101.rc | 8 ++++---- device.mk | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 4909b618..87e829e9 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -168,7 +168,7 @@ BOARD_USE_CSC_FILTER := false BOARD_USE_DEC_SW_CSC := true BOARD_USE_ENC_SW_CSC := true BOARD_SUPPORT_MFC_ENC_RGB := true -BOARD_USE_BLOB_ALLOCATOR := false +BOARD_USE_BLOB_ALLOCATOR := true ######################## BOARD_SUPER_PARTITION_SIZE := 8531214336 diff --git a/conf/ueventd.gs101.rc b/conf/ueventd.gs101.rc index f85b24b6..9588dff8 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 drmrpc -/dev/dma_heap/video_system 0444 system drmrpc -/dev/dma_heap/video_system-uncached 0444 system drmrpc +/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/vscaler-secure 0444 system graphics -/dev/dma_heap/vstream-secure 0444 system drmrpc +/dev/dma_heap/vstream-secure 0444 system graphics /dev/dma_heap/sensor_direct_heap 0444 system graphics diff --git a/device.mk b/device.mk index 3acf0fca..17b0e982 100644 --- a/device.mk +++ b/device.mk @@ -720,9 +720,6 @@ PRODUCT_PACKAGES += \ 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 \