Merge pull request #1277 from darinatoda/test

Enable kernel config options from ayufan kernel including mali.
2019-02-12 18:44:41 +02:00 · 2019-02-12 18:44:41 +02:00 · bfed510a87
commit bfed510a87
parent dc5c903f23 923502bc77
2 changed files with 201 additions and 91 deletions
--- a/config/kernel/linux-rockchip64-default.config
+++ b/config/kernel/linux-rockchip64-default.config
@ -573,9 +573,9 @@ CONFIG_CPU_FREQ_TIMES=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@ -1443,7 +1443,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_RAM_DAX is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
-# CONFIG_BLK_DEV_RBD is not set
+CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_BLK_DEV_NVME=y

@ -1988,7 +1988,7 @@ CONFIG_NET_VENDOR_SUN=y
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
 CONFIG_NET_VENDOR_TEHUTI=y
-# CONFIG_TEHUTI is not set
+CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TLAN is not set
@ -2444,7 +2444,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_VTL_CT36X is not set
-# CONFIG_TOUCHSCREEN_GT1X is not set
+CONFIG_TOUCHSCREEN_GT1X=y
 CONFIG_ROCKCHIP_REMOTECTL=y
 CONFIG_ROCKCHIP_REMOTECTL_PWM=y

@ -2852,8 +2852,8 @@ CONFIG_CHARGER_UNIVERSAL=m
 # CONFIG_BATTERY_EC is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_RK816 is not set
-# CONFIG_BATTERY_RK817 is not set
-# CONFIG_CHARGER_RK817 is not set
+CONFIG_BATTERY_RK817=y
+CONFIG_CHARGER_RK817=y
 # CONFIG_BATTERY_RK818 is not set
 # CONFIG_CHARGER_RK818 is not set
 # CONFIG_CHARGER_RT9455 is not set
@ -3247,6 +3247,7 @@ CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEOBUF2_CORE=y
 CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
 CONFIG_VIDEOBUF2_VMALLOC=y
 CONFIG_VIDEOBUF2_DMA_SG=y
 CONFIG_DVB_CORE=y
@ -3443,8 +3444,8 @@ CONFIG_SOC_CAMERA=y
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_VIDEO_RK_CIF_ISP10=y
 # CONFIG_VIDEO_ROCKCHIP_CIF is not set
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
-CONFIG_VIDEO_ROCKCHIP_ISP_DPHY_SY=m
+CONFIG_VIDEO_ROCKCHIP_ISP1=y
+CONFIG_VIDEO_ROCKCHIP_ISP_DPHY_SY=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_SH_VEU is not set
@ -3852,6 +3853,7 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
 # CONFIG_DRM_SCDC_HELPER is not set
 CONFIG_DRM_DMA_SYNC=y

@ -3880,11 +3882,11 @@ CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_DRM_TVE=y
-# CONFIG_ROCKCHIP_RGB is not set
-# CONFIG_ROCKCHIP_DRM_BACKLIGHT is not set
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_DRM_BACKLIGHT=y
 # CONFIG_ROCKCHIP_RK3066_HDMI is not set
 CONFIG_DRM_UDL=y
-# CONFIG_DRM_AST is not set
+CONFIG_DRM_AST=m
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_QXL is not set
@ -3927,7 +3929,23 @@ CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_MALI_DT=y
 CONFIG_MALI_DEVFREQ=y
 # CONFIG_MALI_QUIET is not set
-# CONFIG_MALI_MIDGARD is not set
+CONFIG_MALI_MIDGARD=m
+# CONFIG_MALI_GATOR_SUPPORT is not set
+# CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
+CONFIG_MALI_DMA_FENCE=y
+CONFIG_MALI_EXPERT=y
+# CONFIG_MALI_CORESTACK is not set
+# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set
+# CONFIG_MALI_PLATFORM_FAKE is not set
+# CONFIG_MALI_PLATFORM_DEVICETREE is not set
+CONFIG_MALI_PLATFORM_THIRDPARTY=y
+CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
+CONFIG_MALI_DEBUG=y
+# CONFIG_MALI_NO_MALI is not set
+# CONFIG_MALI_TRACE_TIMELINE is not set
+# CONFIG_MALI_SYSTEM_TRACE is not set
+# CONFIG_MALI_GPU_MMU_AARCH64 is not set
+CONFIG_MALI_PWRSOFT_765=y
 # CONFIG_MALI_KUTF is not set
 CONFIG_MALI_BIFROST_FOR_ANDROID=y
 # CONFIG_MALI_BIFROST_FOR_LINUX is not set
@ -4032,7 +4050,7 @@ CONFIG_LCD_GENERAL=y
 #
 # RGA2
 #
-# CONFIG_ROCKCHIP_RGA2 is not set
+CONFIG_ROCKCHIP_RGA2=y

 #
 # VCODEC
@ -4213,7 +4231,7 @@ CONFIG_SND_SOC_ROCKCHIP=y
 CONFIG_SND_SOC_ROCKCHIP_I2S=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
 # CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set
-# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
+CONFIG_SND_SOC_ROCKCHIP_PDM=y
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 # CONFIG_SND_SOC_ROCKCHIP_SPDIFRX is not set
 # CONFIG_SND_SOC_ROCKCHIP_VAD is not set
@ -4221,10 +4239,10 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 CONFIG_SND_SOC_ROCKCHIP_HDMI_ANALOG=m
 CONFIG_SND_SOC_ROCKCHIP_HDMI_DP=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
-# CONFIG_SND_SOC_ROCKCHIP_MULTICODECS is not set
+CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
 CONFIG_SND_SOC_ROCKCHIP_RT5645=y
 # CONFIG_SND_SOC_ROCKCHIP_RT5651_TC358749 is not set
-# CONFIG_SND_SOC_ROCKCHIP_CDNDP is not set
+CONFIG_SND_SOC_ROCKCHIP_CDNDP=y

 #
 # Allwinner SoC Audio support
@ -4275,9 +4293,9 @@ CONFIG_SND_SOC_MAX98090=y
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RK312X is not set
 # CONFIG_SND_SOC_RK3228 is not set
-# CONFIG_SND_SOC_RK3308 is not set
-# CONFIG_SND_SOC_RK3328 is not set
-# CONFIG_SND_SOC_RK817 is not set
+CONFIG_SND_SOC_RK3308=y
+CONFIG_SND_SOC_RK3328=y
+CONFIG_SND_SOC_RK817=y
 CONFIG_SND_SOC_RL6231=y
 CONFIG_SND_SOC_RT5616=y
 # CONFIG_SND_SOC_RT5631 is not set
@ -4337,80 +4355,89 @@ CONFIG_HID_GENERIC=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX is not set
+CONFIG_HID_A4TECH=y
+CONFIG_HID_ACRUX=y
+# CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
+CONFIG_HID_APPLEIR=y
+CONFIG_HID_AUREAL=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_BETOP_FF=y
 CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CORSAIR=y
+CONFIG_HID_PRODIKEYS=y
+CONFIG_HID_CP2112=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_DRAGONRISE=y
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=y
+CONFIG_HID_ELECOM=y
+CONFIG_HID_ELO=y
+CONFIG_HID_EZKEY=y
+CONFIG_HID_GEMBIRD=y
+CONFIG_HID_GFRM=y
+CONFIG_HID_HOLTEK=y
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GT683R=y
+CONFIG_HID_KEYTOUCH=y
+CONFIG_HID_KYE=y
+CONFIG_HID_UCLOGIC=y
+CONFIG_HID_WALTOP=y
+CONFIG_HID_GYRATION=y
+CONFIG_HID_ICADE=y
+CONFIG_HID_TWINHAN=y
 CONFIG_HID_KENSINGTON=m
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
+CONFIG_HID_LCPOWER=y
+CONFIG_HID_LENOVO=y
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGIG940_FF is not set
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
 # CONFIG_LOGIWHEELS_FF is not set
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
+CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
+CONFIG_HID_NTRIG=y
+CONFIG_HID_ORTEK=y
+CONFIG_HID_PANTHERLORD=y
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=y
+CONFIG_HID_PETALYNX=y
 # CONFIG_HID_PICOLCD is not set
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
+CONFIG_HID_ROCCAT=y
+CONFIG_HID_SAITEK=y
+CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=m
 # CONFIG_SONY_FF is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
+CONFIG_HID_SPEEDLINK=y
+CONFIG_HID_STEELSERIES=y
+CONFIG_HID_SUNPLUS=y
 CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
+CONFIG_HID_GREENASIA=y
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=y
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=y
+CONFIG_HID_TOPSEED=y
+CONFIG_HID_THINGM=y
+CONFIG_HID_THRUSTMASTER=y
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=y
 CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_RKVR is not set
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_XINMO=y
+CONFIG_HID_ZEROPLUS=y
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=y
+CONFIG_HID_SENSOR_HUB=y
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=y
+CONFIG_HID_RKVR=y
+CONFIG_HID_ALPS=y

 #
 # USB HID support
@ -4677,17 +4704,22 @@ CONFIG_USB_LIBCOMPOSITE=y
 CONFIG_USB_F_ACM=y
 CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
 CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_FS=y
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
@ -5161,7 +5193,9 @@ CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
 CONFIG_ROCKCHIP_IOMMU=y
-# CONFIG_RK_IOMMU is not set
+CONFIG_RK_IOMMU=y
+CONFIG_RK_IOVMM=y
+# CONFIG_RK_IOMMU_DEBUG is not set
 # CONFIG_ARM_SMMU is not set
 # CONFIG_ARM_SMMU_V3 is not set

@ -5194,7 +5228,7 @@ CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
-# CONFIG_ROCKCHIP_PVTM is not set
+CONFIG_ROCKCHIP_PVTM=y
 CONFIG_ROCKCHIP_SUSPEND_MODE=y
 # CONFIG_ROCKCHIP_VENDOR_STORAGE is not set
 # CONFIG_SUNXI_SRAM is not set
@ -5212,11 +5246,11 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y
 #
 # DEVFREQ Drivers
 #
-# CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ is not set
+CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=y
 CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP is not set
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y
 CONFIG_EXTCON=y

 #
@ -5241,6 +5275,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_BMA180 is not set
 # CONFIG_BMC150_ACCEL is not set
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
@ -5288,6 +5323,7 @@ CONFIG_ROCKCHIP_SARADC=y
 #
 # Hid Sensor IIO Common
 #
+# CONFIG_HID_SENSOR_IIO_COMMON is not set

 #
 # SSP Sensor Common
@ -5339,6 +5375,7 @@ CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
+# CONFIG_HID_SENSOR_GYRO_3D is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set

@ -5373,6 +5410,8 @@ CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_ISL29125 is not set
+# CONFIG_HID_SENSOR_ALS is not set
+# CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
@ -5394,12 +5433,15 @@ CONFIG_VL6180=m
 # CONFIG_AK09911 is not set
 # CONFIG_BMC150_MAGN is not set
 # CONFIG_MAG3110 is not set
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set

 #
 # Inclinometer sensors
 #
+# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set

 #
 # Triggers - standalone
@ -5416,6 +5458,7 @@ CONFIG_IIO_SYSFS_TRIGGER=y
 # Pressure sensors
 #
 # CONFIG_BMP280 is not set
+# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_MPL115 is not set
 # CONFIG_MPL3115 is not set
 # CONFIG_MS5611 is not set
@ -5498,7 +5541,7 @@ CONFIG_ANDROID=y
 # CONFIG_LIBNVDIMM is not set
 CONFIG_NVMEM=y
 CONFIG_ROCKCHIP_EFUSE=y
-# CONFIG_ROCKCHIP_OTP is not set
+CONFIG_ROCKCHIP_OTP=m
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set

@ -5561,7 +5604,7 @@ CONFIG_XFS_FS=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
+CONFIG_XFS_WARN=y
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
@ -5737,7 +5780,7 @@ CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
@ -5826,12 +5869,16 @@ CONFIG_PRINTK_TIME=y
 # CONFIG_PRINTK_PROCESS is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
+CONFIG_DYNAMIC_DEBUG=y

 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=2048
@ -5939,6 +5986,7 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_GPU_TRACEPOINTS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
--- a/patch/kernel/rockchip64-default/04-patch-4.4.167-168_mali2.patch
+++ b/patch/kernel/rockchip64-default/04-patch-4.4.167-168_mali2.patch
@ -0,0 +1,62 @@
+diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c
+index 4a223e8e..42e0df5d 100644
+--- a/drivers/gpu/arm/midgard/mali_kbase_mem.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c
+@@ -2182,14 +2182,14 @@ static int kbase_jd_user_buf_map(struct kbase_context *kctx,
+ 	pinned_pages = get_user_pages(NULL, mm,
+ 			address,
+ 			alloc->imported.user_buf.nr_pages,
+-			reg->flags & KBASE_REG_GPU_WR,
+-			0, pages, NULL);
+			reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+			pages, NULL);
+ #elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
+ 	pinned_pages = get_user_pages_remote(NULL, mm,
+ 			address,
+ 			alloc->imported.user_buf.nr_pages,
+-			reg->flags & KBASE_REG_GPU_WR,
+-			0, pages, NULL);
+			reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+			pages, NULL);
+ #elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ 	pinned_pages = get_user_pages_remote(NULL, mm,
+ 			address,
+@@ -2201,7 +2201,7 @@ static int kbase_jd_user_buf_map(struct kbase_context *kctx,
+ 			address,
+ 			alloc->imported.user_buf.nr_pages,
+ 			reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+-			pages, NULL, NULL);
+			pages, NULL);
+ #endif
+ 
+ 	if (pinned_pages <= 0)
+diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+index eea429a8..76610fda 100644
+--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+@@ -1161,10 +1161,8 @@ static struct kbase_va_region *kbase_mem_from_user_buffer(
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+ 	faulted_pages = get_user_pages(current, current->mm, address, *va_pages,
+-			reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL);
+-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
+-	faulted_pages = get_user_pages(address, *va_pages,
+-			reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL);
+			reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+			pages, NULL);
+ #else
+ 	faulted_pages = get_user_pages(address, *va_pages,
+ 			reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c
+index 8fc83cea..03645213 100644
+--- a/drivers/video/rockchip/rga2/rga2_mmu_info.c
+++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c
+@@ -312,7 +312,7 @@ static int rga2_MapUserMemory(struct page **pages, uint32_t *pageTable,
+ 	down_read(&current->mm->mmap_sem);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+ 	result = get_user_pages(current, current->mm, Memory << PAGE_SHIFT,
+-				pageCount, writeFlag, 0, pages, NULL);
+				pageCount, writeFlag ? FOLL_WRITE : 0, pages, NULL);
+ #else
+ 	result = get_user_pages_remote(current, current->mm,
+ 				       Memory << PAGE_SHIFT,