diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config index 358b7316db..2e62bd6ef2 100644 --- a/config/kernel/linux-rockchip-dev.config +++ b/config/kernel/linux-rockchip-dev.config @@ -5058,6 +5058,17 @@ CONFIG_MTK_MMC=m # # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_EROFS_FS is not set + +# +# ROCKCHIP_MPP +# +CONFIG_ROCKCHIP_MPP_SERVICE=m +CONFIG_ROCKCHIP_MPP_DEVICE=m +CONFIG_ROCKCHIP_MPP_VDEC_DEVICE=m +CONFIG_ROCKCHIP_MPP_VDPU1_DEVICE=m +CONFIG_ROCKCHIP_MPP_VEPU1_DEVICE=m +CONFIG_ROCKCHIP_MPP_VDPU2_DEVICE=m +CONFIG_ROCKCHIP_MPP_VEPU2_DEVICE=m # CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y # CONFIG_CROS_EC_I2C is not set diff --git a/patch/kernel/rockchip-dev/2006-soc-rockchip-power-domain-export-idle-request.patch b/patch/kernel/rockchip-dev/2006-soc-rockchip-power-domain-export-idle-request.patch index be15c35544..5db1e62276 100755 --- a/patch/kernel/rockchip-dev/2006-soc-rockchip-power-domain-export-idle-request.patch +++ b/patch/kernel/rockchip-dev/2006-soc-rockchip-power-domain-export-idle-request.patch @@ -1,32 +1,24 @@ -From 4ffe79de7272234408a9179aa4c403ee1b67a362 Mon Sep 17 00:00:00 2001 -From: Myy Miouyouyou -Date: Thu, 7 Dec 2017 21:27:52 +0100 -Subject: [PATCH] soc: rockchip: power-domain: export idle request +From e7b60b10cf3fd2f4374ab26c314383121c27fe82 Mon Sep 17 00:00:00 2001 +From: "Miouyouyou (Myy)" +Date: Tue, 22 Jan 2019 21:24:37 +0100 +Subject: [PATCH] soc: rockchip: power-domain: export idle request for RKMPP -We need to put the power status of HEVC/RKVDEC IP into IDLE -unless we can't reset that IP or the SoC would crash down. -rockchip_pmu_idle_request(dev, true)---> enter idle -rockchip_pmu_idle_request(dev, false)---> exit idle +This function, and the added header, are required by the RKMPP driver, +provided by Randy Li. However, I can't attest that the provided code +is correct. -Only the video codec drivers of rockchip platform would -request this patch currently. - -I am not sure whether it is necessary to add a new function -at generic power domain. I want someone give me some advises -here. - -Signed-off-by: Myy Miouyouyou +Signed-off-by: Miouyouyou (Myy) --- drivers/soc/rockchip/pm_domains.c | 23 +++++++++++++++++++++++ - include/linux/rockchip_pmu.h | 15 +++++++++++++++ + include/soc/rockchip/pm_domains.h | 15 +++++++++++++++ 2 files changed, 38 insertions(+) - create mode 100644 include/linux/rockchip_pmu.h + create mode 100644 include/soc/rockchip/pm_domains.h diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c -index 40b75748..0006ed53 100644 +index 847c7c482..3e2e252cb 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c -@@ -180,6 +180,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd, +@@ -199,6 +199,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd, return 0; } @@ -56,11 +48,11 @@ index 40b75748..0006ed53 100644 static int rockchip_pmu_save_qos(struct rockchip_pm_domain *pd) { int i; -diff --git a/include/linux/rockchip_pmu.h b/include/linux/rockchip_pmu.h +diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h new file mode 100644 -index 00000000..720b3314 +index 000000000..720b3314e --- /dev/null -+++ b/include/linux/rockchip_pmu.h ++++ b/include/soc/rockchip/pm_domains.h @@ -0,0 +1,15 @@ +/* + * pm_domain.h - Definitions and headers related to device power domains. @@ -78,5 +70,5 @@ index 00000000..720b3314 + +#endif /* _LINUX_ROCKCHIP_PM_H */ -- -2.14.1 +2.16.4