diff options
| author | Yong Gan <yong.gan@nxp.com> | 2018-08-07 09:14:38 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:33:05 +0800 |
| commit | 80ed12a185307ebdef34cc7ed6559188e7d9b839 (patch) | |
| tree | 23fc0a890b27048e43bbf609fbdbdbd5d63671db | |
| parent | 70144c5e967bd60e94e84595d0a35fb86c69ae5f (diff) | |
MGS-3527-2 [#imx-885] enable android native fence for Weston sync
Fixed the build break for android platform.
set ANDROID_NATIVE_FENCE_SYNC to be 2.
Date: Aug 6, 2018
Signed-off-by: Yong Gan<yong.gan@nxp.com>
| -rw-r--r-- | drivers/mxc/gpu-viv/Kbuild | 4 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/config | 1 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mxc/gpu-viv/Kbuild b/drivers/mxc/gpu-viv/Kbuild index 481f9a258da9..653461c9a983 100644 --- a/drivers/mxc/gpu-viv/Kbuild +++ b/drivers/mxc/gpu-viv/Kbuild @@ -309,10 +309,6 @@ else EXTRA_CFLAGS += -DgcdENABLE_DRM=0 endif -ifeq ($(ANDROID_NATIVE_FENCE_SYNC), 1) -EXTRA_CFLAGS += -DgcdANDROID_NATIVE_FENCE_SYNC=1 -endif - EXTRA_CFLAGS += -I$(AQROOT)/hal/kernel/inc EXTRA_CFLAGS += -I$(AQROOT)/hal/kernel EXTRA_CFLAGS += -I$(AQROOT)/hal/kernel/arch diff --git a/drivers/mxc/gpu-viv/config b/drivers/mxc/gpu-viv/config index 6f6c5e4e133d..9873ae29c580 100644 --- a/drivers/mxc/gpu-viv/config +++ b/drivers/mxc/gpu-viv/config @@ -67,7 +67,6 @@ NONPAGED_MEMORY_CACHEABLE ?= 0 NONPAGED_MEMORY_BUFFERABLE ?= 1 CACHE_FUNCTION_UNIMPLEMENTED ?= 0 USE_BANK_ALIGNMENT ?= 1 -ANDROID_NATIVE_FENCE_SYNC ?= 1 BANK_BIT_START ?= 13 BANK_BIT_END ?= 15 BANK_CHANNEL_BIT ?= 12 diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config index 396ae1de8741..ea83bd993d35 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config @@ -3,13 +3,14 @@ EXTRA_CFLAGS += -DgcdFSL_CONTIGUOUS_SIZE=134217728 ifneq ($(CONFIG_ANDROID),) # build for android -EXTRA_CFLAGS += -DgcdANDROID_NATIVE_FENCE_SYNC=2 EXTRA_CFLAGS += -DgcdANDROID +endif + +EXTRA_CFLAGS += -DgcdANDROID_NATIVE_FENCE_SYNC=2 ifeq ($(CONFIG_SYNC)$(CONFIG_SYNC_FILE),) $(warn CONFIG_SYNC or CONFIG_SYNC_FILE is not set in kernel config) $(warn Android native fence sync requires CONFIG_SYNC or CONFIG_SYNC_FILE) endif -endif ifneq ($(CONFIG_ARCH_FSL_IMX8QM),) EXTRA_CFLAGS += -DIMX8_SCU_CONTROL=1 -DIMX8_PHYS_BASE=0x80000000 -DIMX8_PHYS_SIZE=0x80000000 |