From 184562c0f8508b2c06ab322b0aa042a36da720f8 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Wed, 11 May 2022 04:41:03 +0000 Subject: [PATCH] Revert "[Gralloc] Remove the conditional configs for Gralloc" This reverts commit 15dd6c2272440cb1426422295e8122d0bbe2527d. Reason for revert: Caused the power regression b/231537621 Change-Id: Ie8d74127a16cf0a938201cf5e1cb7a76fa9ade0e --- BoardConfig-common.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 313ca5d9..afcb1f51 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -104,6 +104,7 @@ BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg USE_OPENGL_RENDERER := true NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true +BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION) BOARD_USES_ALIGN_RESTRICTION := false BOARD_USES_GRALLOC_ION_SYNC := true @@ -111,6 +112,8 @@ BOARD_USES_GRALLOC_ION_SYNC := true BOARD_USES_SWIFTSHADER := false # Gralloc4 +ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) + ifeq ($(BOARD_USES_SWIFTSHADER),true) $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true) $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false) @@ -124,8 +127,15 @@ $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true) $(call soong_config_set,arm_gralloc,gralloc_init_afbc,true) $(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true) endif # ifeq ($(BOARD_USES_SWIFTSHADER),true) - $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC)) +endif # ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) + +# libVendorGraphicbuffer +ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) +$(call soong_config_set,vendorgraphicbuffer,gralloc_version,four) +else +$(call soong_config_set,vendorgraphicbuffer,gralloc_version,three) +endif # Graphics #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true