From 15dd6c2272440cb1426422295e8122d0bbe2527d Mon Sep 17 00:00:00 2001 From: Yichi Chen Date: Thu, 28 Apr 2022 09:02:21 +0800 Subject: [PATCH] [Gralloc] Remove the conditional configs for Gralloc Since GRALLOC_VERSION control has been totally removed, the corresponding conditional configs should be removed to avoid wrong configurations. Bug: 224911573 Test: gralloc sync function can work to avoid noise in tiktok Change-Id: I7d48f0271a251dfef2abc13dea59b92c541a497e --- BoardConfig-common.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index afcb1f51..313ca5d9 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -104,7 +104,6 @@ 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 @@ -112,8 +111,6 @@ 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) @@ -127,15 +124,8 @@ $(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 +$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC)) # Graphics #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true