diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config index 404aaaf5b..801522e01 100644 --- a/config/kernel/linux-rockchip-dev.config +++ b/config/kernel/linux-rockchip-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.18.0-rc1 Kernel Configuration +# Linux/arm 4.18.5 Kernel Configuration # # @@ -278,7 +278,6 @@ CONFIG_REFCOUNT_FULL=y # # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -866,14 +865,12 @@ CONFIG_NF_NAT_REDIRECT=y CONFIG_NETFILTER_SYNPROXY=m CONFIG_NF_OSF=m CONFIG_NF_TABLES=m +# CONFIG_NF_TABLES_SET is not set CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m # CONFIG_NFT_FLOW_OFFLOAD is not set -CONFIG_NFT_SET_RBTREE=m -CONFIG_NFT_SET_HASH=m -CONFIG_NFT_SET_BITMAP=m CONFIG_NFT_COUNTER=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m @@ -3159,7 +3156,26 @@ CONFIG_DVB_SP2=m # Graphics support # # CONFIG_IMX_IPUV3_CORE 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_DEVFREQ=y +# CONFIG_MALI_DMA_FENCE is not set +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=y +# CONFIG_MALI_PLATFORM_THIRDPARTY is not set +# CONFIG_MALI_DEBUG is not set +# CONFIG_MALI_FENCE_DEBUG is not set +# 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_2MB_ALLOC is not set +CONFIG_MALI_PWRSOFT_765=y +CONFIG_MALI_KUTF=m CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DP_AUX_CHARDEV is not set @@ -5559,9 +5575,10 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y -CONFIG_SGL_ALLOC=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SGL_ALLOC=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y diff --git a/patch/kernel/rockchip-dev/1007-drivers-drm-rockchip-Enable-IRQ-on-unbind.patch b/patch/kernel/rockchip-dev/1007-drivers-drm-rockchip-Enable-IRQ-on-unbind.patch new file mode 100644 index 000000000..4f889ae4c --- /dev/null +++ b/patch/kernel/rockchip-dev/1007-drivers-drm-rockchip-Enable-IRQ-on-unbind.patch @@ -0,0 +1,36 @@ +From c1c8509bb90f2b3ed046d99cf0fedbddc24290ec Mon Sep 17 00:00:00 2001 +From: Myy Miouyouyou +Date: Thu, 3 May 2018 21:47:40 +0200 +Subject: [PATCH] drivers: drm: rockchip: Enable IRQ on unbind + +Not doing this generate atrocious delays when plugging a screen, +making the whole 3D stack unusable. + +This is an adaptation of Jeffy Chen patch, originally provided +here : +http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html + +Thanks to @JeffyCN for this patch. + +This resolves issue #4 + +Signed-off-by: Myy Miouyouyou +--- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +index 53d4afe1..f903171a 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c ++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +@@ -1601,6 +1601,7 @@ static void vop_unbind(struct device *dev, struct device *master, void *data) + { + struct vop *vop = dev_get_drvdata(dev); + ++ enable_irq(vop->irq); + pm_runtime_disable(dev); + vop_destroy_crtc(vop); + +-- +2.17.0 +