From 6155b7811aacaedc5dde855fcb307ab96282e09c Mon Sep 17 00:00:00 2001 From: Yichi Chen Date: Wed, 11 May 2022 23:21:14 +0000 Subject: [PATCH] Revert "Revert "[Gralloc] Remove the conditional configs for Gralloc"" This reverts commit 184562c0f8508b2c06ab322b0aa042a36da720f8. Reason for revert: The cache coherency shouldn't be reverted. This will cause the function break. Change-Id: I9a62e507911a3eaed704f029546e81770ef3d199 --- 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