Merge pull request #5052 from jernejsk/linux-5.10.11

[Allwinner,Generic,Rockchip] linux: Update to 5.10.11

packages/linux/package.mk

@@ -28,8 +28,8 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.10.4"
+    PKG_VERSION="5.10.11"
-    PKG_SHA256="904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+    PKG_SHA256="02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;

projects/Allwinner/patches/linux/crust/0002-net-stmmac-dwmac-sun8i-Fix-probe-error-handling.patch

@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 Jan 2021 05:17:41 -0600
-Subject: [PATCH] net: stmmac: dwmac-sun8i: Fix probe error handling
-
-stmmac_pltfr_remove does three things in one function, making it
-inapproprate for unwinding the steps in the probe function. Currently,
-a failure before the call to stmmac_dvr_probe would leak OF node
-references due to missing a call to stmmac_remove_config_dt. And an
-error in stmmac_dvr_probe would cause the driver to attempt to remove a
-netdevice that was never added. Fix these by reordering the init and
-splitting out the error handling steps.
-
-Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
-Fixes: 40a1dcee2d18 ("net: ethernet: dwmac-sun8i: Use the correct function in exit path")
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Reviewed-by: Chen-Yu Tsai <wens@csie.org>
----
- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 25 +++++++++++--------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -1134,10 +1134,6 @@ static int sun8i_dwmac_probe(struct plat
- 	if (ret)
- 		return ret;
- 
--	plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
--	if (IS_ERR(plat_dat))
--		return PTR_ERR(plat_dat);
--
- 	gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
- 	if (!gmac)
- 		return -ENOMEM;
-@@ -1201,11 +1197,15 @@ static int sun8i_dwmac_probe(struct plat
- 	ret = of_get_phy_mode(dev->of_node, &interface);
- 	if (ret)
- 		return -EINVAL;
--	plat_dat->interface = interface;
-+
-+	plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
-+	if (IS_ERR(plat_dat))
-+		return PTR_ERR(plat_dat);
- 
- 	/* platform data specifying hardware features and callbacks.
- 	 * hardware features were copied from Allwinner drivers.
- 	 */
-+	plat_dat->interface = interface;
- 	plat_dat->rx_coe = STMMAC_RX_COE_TYPE2;
- 	plat_dat->tx_coe = 1;
- 	plat_dat->has_sun8i = true;
-@@ -1216,7 +1216,7 @@ static int sun8i_dwmac_probe(struct plat
- 
- 	ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv);
- 	if (ret)
--		return ret;
-+		goto dwmac_deconfig;
- 
- 	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
- 	if (ret)
-@@ -1230,7 +1230,7 @@ static int sun8i_dwmac_probe(struct plat
- 	if (gmac->variant->soc_has_internal_phy) {
- 		ret = get_ephy_nodes(priv);
- 		if (ret)
--			goto dwmac_exit;
-+			goto dwmac_remove;
- 		ret = sun8i_dwmac_register_mdio_mux(priv);
- 		if (ret) {
- 			dev_err(&pdev->dev, "Failed to register mux\n");
-@@ -1239,15 +1239,20 @@ static int sun8i_dwmac_probe(struct plat
- 	} else {
- 		ret = sun8i_dwmac_reset(priv);
- 		if (ret)
--			goto dwmac_exit;
-+			goto dwmac_remove;
- 	}
- 
- 	return ret;
- dwmac_mux:
- 	sun8i_dwmac_unset_syscon(gmac);
-+dwmac_remove:
-+	stmmac_dvr_remove(&pdev->dev);
- dwmac_exit:
--	stmmac_pltfr_remove(pdev);
--return ret;
-+	sun8i_dwmac_exit(pdev, gmac);
-+dwmac_deconfig:
-+	stmmac_remove_config_dt(pdev, plat_dat);
-+
-+	return ret;
- }
- 
- static const struct of_device_id sun8i_dwmac_match[] = {

projects/Allwinner/patches/linux/crust/0003-net-stmmac-dwmac-sun8i-Balance-internal-PHY-resource.patch

@@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 Jan 2021 05:17:42 -0600
-Subject: [PATCH] net: stmmac: dwmac-sun8i: Balance internal PHY resource
- references
-
-While stmmac_pltfr_remove calls sun8i_dwmac_exit, the sun8i_dwmac_init
-and sun8i_dwmac_exit functions are also called by the stmmac_platform
-suspend/resume callbacks. They may be called many times during the
-device's lifetime and should not release resources used by the driver.
-
-Furthermore, there was no error handling in case registering the MDIO
-mux failed during probe, and the EPHY clock was never released at all.
-
-Fix all of these issues by moving the deinitialization code to a driver
-removal callback. Also ensure the EPHY is powered down before removal.
-
-Fixes: 634db83b8265 ("net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs")
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Reviewed-by: Chen-Yu Tsai <wens@csie.org>
----
- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 27 ++++++++++++++-----
- 1 file changed, 21 insertions(+), 6 deletions(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -1004,17 +1004,12 @@ static void sun8i_dwmac_exit(struct plat
- 	struct sunxi_priv_data *gmac = priv;
- 
- 	if (gmac->variant->soc_has_internal_phy) {
--		/* sun8i_dwmac_exit could be called with mdiomux uninit */
--		if (gmac->mux_handle)
--			mdio_mux_uninit(gmac->mux_handle);
- 		if (gmac->internal_phy_powered)
- 			sun8i_dwmac_unpower_internal_phy(gmac);
- 	}
- 
- 	sun8i_dwmac_unset_syscon(gmac);
- 
--	reset_control_put(gmac->rst_ephy);
--
- 	clk_disable_unprepare(gmac->tx_clk);
- 
- 	if (gmac->regulator)
-@@ -1244,6 +1239,8 @@ static int sun8i_dwmac_probe(struct plat
- 
- 	return ret;
- dwmac_mux:
-+	reset_control_put(gmac->rst_ephy);
-+	clk_put(gmac->ephy_clk);
- 	sun8i_dwmac_unset_syscon(gmac);
- dwmac_remove:
- 	stmmac_dvr_remove(&pdev->dev);
-@@ -1255,6 +1252,24 @@ dwmac_deconfig:
- 	return ret;
- }
- 
-+static int sun8i_dwmac_remove(struct platform_device *pdev)
-+{
-+	struct net_device *ndev = platform_get_drvdata(pdev);
-+	struct stmmac_priv *priv = netdev_priv(ndev);
-+	struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
-+
-+	if (gmac->variant->soc_has_internal_phy) {
-+		mdio_mux_uninit(gmac->mux_handle);
-+		sun8i_dwmac_unpower_internal_phy(gmac);
-+		reset_control_put(gmac->rst_ephy);
-+		clk_put(gmac->ephy_clk);
-+	}
-+
-+	stmmac_pltfr_remove(pdev);
-+
-+	return 0;
-+}
-+
- static const struct of_device_id sun8i_dwmac_match[] = {
- 	{ .compatible = "allwinner,sun8i-h3-emac",
- 		.data = &emac_variant_h3 },
-@@ -1274,7 +1289,7 @@ MODULE_DEVICE_TABLE(of, sun8i_dwmac_matc
- 
- static struct platform_driver sun8i_dwmac_driver = {
- 	.probe  = sun8i_dwmac_probe,
--	.remove = stmmac_pltfr_remove,
-+	.remove = sun8i_dwmac_remove,
- 	.driver = {
- 		.name           = "dwmac-sun8i",
- 		.pm		= &stmmac_pltfr_pm_ops,

projects/Allwinner/patches/linux/crust/0004-net-stmmac-dwmac-sun8i-Balance-internal-PHY-power.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 Jan 2021 05:17:43 -0600
-Subject: [PATCH] net: stmmac: dwmac-sun8i: Balance internal PHY power
-
-sun8i_dwmac_exit calls sun8i_dwmac_unpower_internal_phy, but
-sun8i_dwmac_init did not call sun8i_dwmac_power_internal_phy. This
-caused PHY power to remain off after a suspend/resume cycle. Fix this by
-recording if PHY power should be restored, and if so, restoring it.
-
-Fixes: 634db83b8265 ("net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs")
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 31 ++++++++++++++-----
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -64,6 +64,7 @@ struct emac_variant {
-  * @variant:	reference to the current board variant
-  * @regmap:	regmap for using the syscon
-  * @internal_phy_powered: Does the internal PHY is enabled
-+ * @use_internal_phy: Is the internal PHY selected for use
-  * @mux_handle:	Internal pointer used by mdio-mux lib
-  */
- struct sunxi_priv_data {
-@@ -74,6 +75,7 @@ struct sunxi_priv_data {
- 	const struct emac_variant *variant;
- 	struct regmap_field *regmap_field;
- 	bool internal_phy_powered;
-+	bool use_internal_phy;
- 	void *mux_handle;
- };
- 
-@@ -539,8 +541,11 @@ static const struct stmmac_dma_ops sun8i
- 	.dma_interrupt = sun8i_dwmac_dma_interrupt,
- };
- 
-+static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv);
-+
- static int sun8i_dwmac_init(struct platform_device *pdev, void *priv)
- {
-+	struct net_device *ndev = platform_get_drvdata(pdev);
- 	struct sunxi_priv_data *gmac = priv;
- 	int ret;
- 
-@@ -554,13 +559,25 @@ static int sun8i_dwmac_init(struct platf
- 
- 	ret = clk_prepare_enable(gmac->tx_clk);
- 	if (ret) {
--		if (gmac->regulator)
--			regulator_disable(gmac->regulator);
- 		dev_err(&pdev->dev, "Could not enable AHB clock\n");
--		return ret;
-+		goto err_disable_regulator;
-+	}
-+
-+	if (gmac->use_internal_phy) {
-+		ret = sun8i_dwmac_power_internal_phy(netdev_priv(ndev));
-+		if (ret)
-+			goto err_disable_clk;
- 	}
- 
- 	return 0;
-+
-+err_disable_clk:
-+	clk_disable_unprepare(gmac->tx_clk);
-+err_disable_regulator:
-+	if (gmac->regulator)
-+		regulator_disable(gmac->regulator);
-+
-+	return ret;
- }
- 
- static void sun8i_dwmac_core_init(struct mac_device_info *hw,
-@@ -831,7 +848,6 @@ static int mdio_mux_syscon_switch_fn(int
- 	struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
- 	u32 reg, val;
- 	int ret = 0;
--	bool need_power_ephy = false;
- 
- 	if (current_child ^ desired_child) {
- 		regmap_field_read(gmac->regmap_field, &reg);
-@@ -839,13 +855,12 @@ static int mdio_mux_syscon_switch_fn(int
- 		case DWMAC_SUN8I_MDIO_MUX_INTERNAL_ID:
- 			dev_info(priv->device, "Switch mux to internal PHY");
- 			val = (reg & ~H3_EPHY_MUX_MASK) | H3_EPHY_SELECT;
--
--			need_power_ephy = true;
-+			gmac->use_internal_phy = true;
- 			break;
- 		case DWMAC_SUN8I_MDIO_MUX_EXTERNAL_ID:
- 			dev_info(priv->device, "Switch mux to external PHY");
- 			val = (reg & ~H3_EPHY_MUX_MASK) | H3_EPHY_SHUTDOWN;
--			need_power_ephy = false;
-+			gmac->use_internal_phy = false;
- 			break;
- 		default:
- 			dev_err(priv->device, "Invalid child ID %x\n",
-@@ -853,7 +868,7 @@ static int mdio_mux_syscon_switch_fn(int
- 			return -EINVAL;
- 		}
- 		regmap_field_write(gmac->regmap_field, val);
--		if (need_power_ephy) {
-+		if (gmac->use_internal_phy) {
- 			ret = sun8i_dwmac_power_internal_phy(priv);
- 			if (ret)
- 				return ret;

projects/Allwinner/patches/linux/crust/0005-net-stmmac-dwmac-sun8i-Balance-syscon-de-initializat.patch

@@ -1,204 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 Jan 2021 05:17:44 -0600
-Subject: [PATCH] net: stmmac: dwmac-sun8i: Balance syscon (de)initialization
-
-Previously, sun8i_dwmac_set_syscon was called from a chain of functions
-in several different files:
-    sun8i_dwmac_probe
-      stmmac_dvr_probe
-        stmmac_hw_init
-          stmmac_hwif_init
-            sun8i_dwmac_setup
-              sun8i_dwmac_set_syscon
-which made the lifetime of the syscon values hard to reason about. Part
-of the problem is that there is no similar platform driver callback from
-stmmac_dvr_remove. As a result, the driver unset the syscon value in
-sun8i_dwmac_exit, but this leaves it uninitialized after a suspend/
-resume cycle. It was also unset a second time (outside sun8i_dwmac_exit)
-in the probe error path.
-
-Move the init to the earliest available place in sun8i_dwmac_probe
-(after stmmac_probe_config_dt, which initializes plat_dat), and the
-deinit to the corresponding position in the cleanup order.
-
-Since priv is not filled in until stmmac_dvr_probe, this requires
-changing the sun8i_dwmac_set_syscon parameters to priv's two relevant
-members.
-
-Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
-Fixes: 634db83b8265 ("net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs")
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 50 +++++++++----------
- 1 file changed, 25 insertions(+), 25 deletions(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -898,22 +898,23 @@ static int sun8i_dwmac_register_mdio_mux
- 	return ret;
- }
- 
--static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)
-+static int sun8i_dwmac_set_syscon(struct device *dev,
-+				  struct plat_stmmacenet_data *plat)
- {
--	struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
--	struct device_node *node = priv->device->of_node;
-+	struct sunxi_priv_data *gmac = plat->bsp_priv;
-+	struct device_node *node = dev->of_node;
- 	int ret;
- 	u32 reg, val;
- 
- 	ret = regmap_field_read(gmac->regmap_field, &val);
- 	if (ret) {
--		dev_err(priv->device, "Fail to read from regmap field.\n");
-+		dev_err(dev, "Fail to read from regmap field.\n");
- 		return ret;
- 	}
- 
- 	reg = gmac->variant->default_syscon_value;
- 	if (reg != val)
--		dev_warn(priv->device,
-+		dev_warn(dev,
- 			 "Current syscon value is not the default %x (expect %x)\n",
- 			 val, reg);
- 
-@@ -926,9 +927,9 @@ static int sun8i_dwmac_set_syscon(struct
- 		/* Force EPHY xtal frequency to 24MHz. */
- 		reg |= H3_EPHY_CLK_SEL;
- 
--		ret = of_mdio_parse_addr(priv->device, priv->plat->phy_node);
-+		ret = of_mdio_parse_addr(dev, plat->phy_node);
- 		if (ret < 0) {
--			dev_err(priv->device, "Could not parse MDIO addr\n");
-+			dev_err(dev, "Could not parse MDIO addr\n");
- 			return ret;
- 		}
- 		/* of_mdio_parse_addr returns a valid (0 ~ 31) PHY
-@@ -944,17 +945,17 @@ static int sun8i_dwmac_set_syscon(struct
- 
- 	if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) {
- 		if (val % 100) {
--			dev_err(priv->device, "tx-delay must be a multiple of 100\n");
-+			dev_err(dev, "tx-delay must be a multiple of 100\n");
- 			return -EINVAL;
- 		}
- 		val /= 100;
--		dev_dbg(priv->device, "set tx-delay to %x\n", val);
-+		dev_dbg(dev, "set tx-delay to %x\n", val);
- 		if (val <= gmac->variant->tx_delay_max) {
- 			reg &= ~(gmac->variant->tx_delay_max <<
- 				 SYSCON_ETXDC_SHIFT);
- 			reg |= (val << SYSCON_ETXDC_SHIFT);
- 		} else {
--			dev_err(priv->device, "Invalid TX clock delay: %d\n",
-+			dev_err(dev, "Invalid TX clock delay: %d\n",
- 				val);
- 			return -EINVAL;
- 		}
-@@ -962,17 +963,17 @@ static int sun8i_dwmac_set_syscon(struct
- 
- 	if (!of_property_read_u32(node, "allwinner,rx-delay-ps", &val)) {
- 		if (val % 100) {
--			dev_err(priv->device, "rx-delay must be a multiple of 100\n");
-+			dev_err(dev, "rx-delay must be a multiple of 100\n");
- 			return -EINVAL;
- 		}
- 		val /= 100;
--		dev_dbg(priv->device, "set rx-delay to %x\n", val);
-+		dev_dbg(dev, "set rx-delay to %x\n", val);
- 		if (val <= gmac->variant->rx_delay_max) {
- 			reg &= ~(gmac->variant->rx_delay_max <<
- 				 SYSCON_ERXDC_SHIFT);
- 			reg |= (val << SYSCON_ERXDC_SHIFT);
- 		} else {
--			dev_err(priv->device, "Invalid RX clock delay: %d\n",
-+			dev_err(dev, "Invalid RX clock delay: %d\n",
- 				val);
- 			return -EINVAL;
- 		}
-@@ -983,7 +984,7 @@ static int sun8i_dwmac_set_syscon(struct
- 	if (gmac->variant->support_rmii)
- 		reg &= ~SYSCON_RMII_EN;
- 
--	switch (priv->plat->interface) {
-+	switch (plat->interface) {
- 	case PHY_INTERFACE_MODE_MII:
- 		/* default */
- 		break;
-@@ -997,8 +998,8 @@ static int sun8i_dwmac_set_syscon(struct
- 		reg |= SYSCON_RMII_EN | SYSCON_ETCS_EXT_GMII;
- 		break;
- 	default:
--		dev_err(priv->device, "Unsupported interface mode: %s",
--			phy_modes(priv->plat->interface));
-+		dev_err(dev, "Unsupported interface mode: %s",
-+			phy_modes(plat->interface));
- 		return -EINVAL;
- 	}
- 
-@@ -1023,8 +1024,6 @@ static void sun8i_dwmac_exit(struct plat
- 			sun8i_dwmac_unpower_internal_phy(gmac);
- 	}
- 
--	sun8i_dwmac_unset_syscon(gmac);
--
- 	clk_disable_unprepare(gmac->tx_clk);
- 
- 	if (gmac->regulator)
-@@ -1059,16 +1058,11 @@ static struct mac_device_info *sun8i_dwm
- {
- 	struct mac_device_info *mac;
- 	struct stmmac_priv *priv = ppriv;
--	int ret;
- 
- 	mac = devm_kzalloc(priv->device, sizeof(*mac), GFP_KERNEL);
- 	if (!mac)
- 		return NULL;
- 
--	ret = sun8i_dwmac_set_syscon(priv);
--	if (ret)
--		return NULL;
--
- 	mac->pcsr = priv->ioaddr;
- 	mac->mac = &sun8i_dwmac_ops;
- 	mac->dma = &sun8i_dwmac_dma_ops;
-@@ -1224,10 +1218,14 @@ static int sun8i_dwmac_probe(struct plat
- 	plat_dat->exit = sun8i_dwmac_exit;
- 	plat_dat->setup = sun8i_dwmac_setup;
- 
--	ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv);
-+	ret = sun8i_dwmac_set_syscon(&pdev->dev, plat_dat);
- 	if (ret)
- 		goto dwmac_deconfig;
- 
-+	ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv);
-+	if (ret)
-+		goto dwmac_syscon;
-+
- 	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
- 	if (ret)
- 		goto dwmac_exit;
-@@ -1256,11 +1254,12 @@ static int sun8i_dwmac_probe(struct plat
- dwmac_mux:
- 	reset_control_put(gmac->rst_ephy);
- 	clk_put(gmac->ephy_clk);
--	sun8i_dwmac_unset_syscon(gmac);
- dwmac_remove:
- 	stmmac_dvr_remove(&pdev->dev);
- dwmac_exit:
- 	sun8i_dwmac_exit(pdev, gmac);
-+dwmac_syscon:
-+	sun8i_dwmac_unset_syscon(gmac);
- dwmac_deconfig:
- 	stmmac_remove_config_dt(pdev, plat_dat);
- 
-@@ -1281,6 +1280,7 @@ static int sun8i_dwmac_remove(struct pla
- 	}
- 
- 	stmmac_pltfr_remove(pdev);
-+	sun8i_dwmac_unset_syscon(gmac);
- 
- 	return 0;
- }

projects/Generic/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.0 Kernel Configuration
+# Linux/x86 5.10.11 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-10.2.0 (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y

projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.4 Kernel Configuration
+# Linux/arm 5.10.11 Kernel Configuration
 #
 
 #
@@ -454,6 +454,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
+CONFIG_STACKPROTECTOR_PER_TASK=y
 # end of Kernel Features
 
 #
@@ -660,6 +661,10 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y

projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.4 Kernel Configuration
+# Linux/arm64 5.10.11 Kernel Configuration
 #
 
 #

projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.4 Kernel Configuration
+# Linux/arm64 5.10.11 Kernel Configuration
 #
 
 #

projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-5.11.patch

@@ -1,4 +1,4 @@
-From 7bdda3f24987c034767b0834a63bd0379301553a Mon Sep 17 00:00:00 2001
+From b4b584ce10d458e20051c766f795efdb13c14fc7 Mon Sep 17 00:00:00 2001
 From: Robin Murphy <robin.murphy@arm.com>
 Date: Mon, 26 Oct 2020 11:17:20 +0000
 Subject: [PATCH] clk: rockchip: Add appropriate arch dependencies
@@ -98,7 +98,7 @@ index 47cd6c5de837..effd05032e85 100644
  	help
  	  Build the driver for RK3399 Clock Driver.
 
-From 7a9ce2f8a4e405c67287b076e07420766c33f1e6 Mon Sep 17 00:00:00 2001
+From 6a9528bb32e07fac71965605c270f4d449d4aa95 Mon Sep 17 00:00:00 2001
 From: Xu Wang <vulab@iscas.ac.cn>
 Date: Fri, 27 Nov 2020 09:05:51 +0000
 Subject: [PATCH] clk: rockchip: Remove redundant null check before
@@ -130,7 +130,7 @@ index b443169dd408..336481bc6cc7 100644
  }
  EXPORT_SYMBOL_GPL(rockchip_clk_protect_critical);
 
-From 4e5568fccbf904926141cf11aa5ae5e6870ce1c8 Mon Sep 17 00:00:00 2001
+From 33f193b83873d8d570ac5e4e990fc254aaf6ed9c Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Wed, 18 Nov 2020 14:58:16 +0100
 Subject: [PATCH] clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a
@@ -253,7 +253,7 @@ index 730020fcc7fe..db8c588139de 100644
  			RK2928_CLKGATE_CON(0), 12, GFLAGS,
  			&rk3066a_i2s2_fracmux),
 
-From e09debc09e9dfe38b0347be56d5dc63e1a567f8b Mon Sep 17 00:00:00 2001
+From e027775aa51cbaaa2828abcfa0227736ffa1b663 Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Wed, 18 Nov 2020 14:58:17 +0100
 Subject: [PATCH] clk: rockchip: fix i2s gate bits on rk3066 and rk3188
@@ -315,7 +315,7 @@ index db8c588139de..0b76ad34de00 100644
  	GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS),
  
 
-From c14cd8d58bb0d1b71a501d20b61752c0115aa1d6 Mon Sep 17 00:00:00 2001
+From 22fa5e351f8d8f8b139e206e545e610173860ac8 Mon Sep 17 00:00:00 2001
 From: Alexandru Stan <amstan@chromium.org>
 Date: Wed, 21 Oct 2020 22:04:43 -0700
 Subject: [PATCH] ARM: dts: rockchip: Remove 0 point from brightness-levels on
@@ -385,7 +385,7 @@ index 069f0c2c1fdf..52a84cbe7a90 100644
  };
  
 
-From f4993c1a24b4ecfc6253cc7e82a759bcc9891b1a Mon Sep 17 00:00:00 2001
+From 79b3eebc9012ed02fe41819b1544d49c1330e79b Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Mon, 16 Nov 2020 16:07:56 +0100
 Subject: [PATCH] ARM: dts: rockchip: rename wdt nodename to watchdog on rv1108
@@ -423,7 +423,7 @@ index a1a08cb9364e..e491964b1c3d 100644
  		reg = <0x10360000 0x100>;
  		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 
-From 4d7bc6b808cb61c7803049b0dc71e93202089e1f Mon Sep 17 00:00:00 2001
+From 584d663fe6d38f0be2cd41bb20b774934ec86ec3 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 30 Nov 2020 14:28:14 +0100
 Subject: [PATCH] ARM: dts: rockchip: Add rtc node for VMARC SOM
@@ -481,7 +481,7 @@ index 4a373f5aa600..da80bfd5f2d5 100644
  		drive-strength = <8>;
  	};
 
-From 2a67f75ad25fd99946aa142ff63c98bb98b8c11b Mon Sep 17 00:00:00 2001
+From 7338ce1b96ce9c9f034ce135150b5ce7307b162e Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Fri, 23 Oct 2020 23:48:14 +0530
 Subject: [PATCH] ARM: dts: rockchip: Add SDIO0 node for VMARC SOM
@@ -617,7 +617,7 @@ index 5d087be04af8..7257494d2831 100644
  	bus-width = <8>;
  	mmc-hs400-1_8v;
 
-From cc4ce3fd56ab4a9a53e00c0b6f6e4b9435982d07 Mon Sep 17 00:00:00 2001
+From d6ccdfe82b00db675ff2783b4b89a303ca15f8af Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:15 +0530
 Subject: [PATCH] arm64: defconfig: Enable ROCKCHIP_LVDS
@@ -647,7 +647,7 @@ index 5cfe3cf6f2ac..3ebba7dcb98f 100644
  CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
 
-From e9eefe21625121fff49fdddfa20efb37e654045d Mon Sep 17 00:00:00 2001
+From 96a2300cbc54a3985ae356540822f04cf1990047 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:16 +0530
 Subject: [PATCH] arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
@@ -678,7 +678,7 @@ index 3ebba7dcb98f..d50826dd7d68 100644
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_UNIPHIER_USB2=y
 
-From 4ce70903bef3a7f5d45e4acdf744185ec0a468c6 Mon Sep 17 00:00:00 2001
+From 6d5ff472008e78e2e1e0f3de8a451a3ba29a5778 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:17 +0530
 Subject: [PATCH] arm64: defconfig: Enable USB_SERIAL_CP210X
@@ -710,7 +710,7 @@ index d50826dd7d68..41a2d489f0a2 100644
  CONFIG_USB_HSIC_USB3503=y
  CONFIG_NOP_USB_XCEIV=y
 
-From dba3d86aca8df97ebd24edde2522ab61833619f1 Mon Sep 17 00:00:00 2001
+From a8b4abbfd284508abb7e8eb3d18111b76e32c794 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Fri, 23 Oct 2020 23:48:13 +0530
 Subject: [PATCH] arm64: defconfig: Enable RTC_DRV_HYM8563
@@ -740,7 +740,7 @@ index 41a2d489f0a2..699c204090b8 100644
  CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_PCF85363=m
 
-From 1df05ffbdb8550fa30547574f785c76e8036beb8 Mon Sep 17 00:00:00 2001
+From 53d92e22359d06623f2c409198689745c0bc12d1 Mon Sep 17 00:00:00 2001
 From: Lee Jones <lee.jones@linaro.org>
 Date: Tue, 3 Nov 2020 15:28:18 +0000
 Subject: [PATCH] soc: rockchip: io-domain: Remove incorrect and incomplete
@@ -778,7 +778,7 @@ index b29e829e815e..cf8182fc3642 100644
  	int grf_offset;
  	const char *supply_names[MAX_SUPPLIES];
 
-From 6393923881cab6d3a4abacb56b742d386d24eb63 Mon Sep 17 00:00:00 2001
+From 62e33371a6343e4b64eabac5af66f916628839e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>
 Date: Wed, 14 Oct 2020 22:00:29 +0200
 Subject: [PATCH] dt-bindings: vendor-prefixes: Add kobol prefix
@@ -810,7 +810,7 @@ index 2735be1a8470..259faf1b382c 100644
      description: Kaohsiung Opto-Electronics Inc.
    "^kontron,.*":
 
-From e4550a0485dc0f693a28e1280e89f279ced3bcd8 Mon Sep 17 00:00:00 2001
+From 90c206503d82a1824a574276d7d8c3b8257258e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>
 Date: Wed, 14 Oct 2020 22:00:30 +0200
 Subject: [PATCH] arm64: dts: rockchip: Add basic support for Kobol's Helios64
@@ -1230,7 +1230,7 @@ index 000000000000..2a561be724b2
 +	status = "okay";
 +};
 
-From 5cdadd99fc57ce819d00a6bcf5720d920c64d9f9 Mon Sep 17 00:00:00 2001
+From 101e24cc374b48db4f59ae10268d370aaa81081c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>
 Date: Mon, 2 Nov 2020 16:06:58 +0100
 Subject: [PATCH] dt-bindings: arm: rockchip: Add Kobol Helios64
@@ -1266,7 +1266,7 @@ index b621752aaa65..ad1dbf349c33 100644
          items:
            - const: mecer,xms6
 
-From e648ff565eca99a4c7f73861d5e00f5999ef1afb Mon Sep 17 00:00:00 2001
+From 4812e1f87c28f8b0281fd32c7c2f915ca9c8c5e3 Mon Sep 17 00:00:00 2001
 From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
 Date: Sat, 4 Jul 2020 00:14:13 +0200
 Subject: [PATCH] arm64: dts: rockchip: add adc joystick to Odroid Go Advance
@@ -1316,7 +1316,7 @@ index 337681038519..97fb93e1cc00 100644
  		compatible = "pwm-backlight";
  		power-supply = <&vcc_bl>;
 
-From ab1d9b1011a0715b1b8e9f7509af5595978c636d Mon Sep 17 00:00:00 2001
+From 8ab3c3a51695225b53dd46fee046f44c69548b06 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:11 +0530
 Subject: [PATCH] dt-bindings: arm: rockchip: Add Engicam PX30.Core EDIMM2.2
@@ -1358,7 +1358,7 @@ index ad1dbf349c33..cef95eb26ca6 100644
          items:
            - enum:
 
-From 8efa7701f53539842009e63eab1c44d4c25f27a0 Mon Sep 17 00:00:00 2001
+From 0ea91553684644f7ec2105300b496693697821c3 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:12 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam EDIMM2.2 Starter Kit
@@ -1455,7 +1455,7 @@ index 000000000000..cb00988953e9
 +
 +#include "px30-engicam-common.dtsi"
 
-From 37f0dd7a1a5ccfdf31502abf3099eb0ba84bc2e0 Mon Sep 17 00:00:00 2001
+From c12ee859634a1d34851b2c1f80f07a7b124b5006 Mon Sep 17 00:00:00 2001
 From: Michael Trimarchi <michael@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:13 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam PX30.Core SOM
@@ -1725,7 +1725,7 @@ index 000000000000..db22f776c68f
 +	status = "okay";
 +};
 
-From d51f542ce24362ea0664a5eb7f5dbda84b577810 Mon Sep 17 00:00:00 2001
+From bc5016747913df8ad96175f3a5038c7331006d1f Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:14 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam PX30.Core EDIMM2.2 Starter
@@ -1789,7 +1789,7 @@ index 000000000000..e54d1e480daa
 +	};
 +};
 
-From 178762dcff60848615f72c18987247416633ad8f Mon Sep 17 00:00:00 2001
+From 5955bbcde3dbb12889de8dcf502fbe4fc026bb1f Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:15 +0530
 Subject: [PATCH] dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
@@ -1830,7 +1830,7 @@ index cef95eb26ca6..37fd456170d2 100644
          items:
            - const: engicam,px30-core-edimm2.2
 
-From 3a0333a1c43aeda0a7eabd3ce97f93b546fc63e1 Mon Sep 17 00:00:00 2001
+From ad2313ab08f6f49e4359f20c4ccd5d5b5e6ec63b Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:16 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam C.TOUCH 2.0
@@ -1876,7 +1876,7 @@ index 000000000000..58425b1e559f
 +
 +#include "px30-engicam-common.dtsi"
 
-From 32a432c01b10885659d2dcd24975e991f1e0cf89 Mon Sep 17 00:00:00 2001
+From 4558410f03ab777e4e413d25f6f317008c9af309 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Tue, 29 Sep 2020 14:02:17 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
@@ -1941,7 +1941,7 @@ index 000000000000..5a0ecb8faecf
 +	};
 +};
 
-From 4402111ed3efffe40616658af7cd677de5954776 Mon Sep 17 00:00:00 2001
+From 92e3be2defa5ca887abd0219e532062354314c16 Mon Sep 17 00:00:00 2001
 From: Chen-Yu Tsai <wens@csie.org>
 Date: Thu, 26 Nov 2020 15:33:35 +0800
 Subject: [PATCH] arm64: dts: rockchip: Enable HDMI audio on rk3328-roc-cc
@@ -1986,7 +1986,7 @@ index b76282e704de..697fce709031 100644
  	status = "okay";
  
 
-From 755eed3a0181ab31177162799c6cbe3ed3c85593 Mon Sep 17 00:00:00 2001
+From f124c7ee4abd51988d6b4330087c91db04e8c58a Mon Sep 17 00:00:00 2001
 From: Chen-Yu Tsai <wens@csie.org>
 Date: Thu, 26 Nov 2020 15:33:36 +0800
 Subject: [PATCH] arm64: dts: rockchip: Enable analog audio on rk3328-roc-cc
@@ -2036,7 +2036,7 @@ index 697fce709031..19959bfba451 100644
  	status = "okay";
  
 
-From 0ec396b3ae638938f6b138e1555afb1d4b1aebed Mon Sep 17 00:00:00 2001
+From e144a0e75bf59398255eb5715dad961d9de0264d Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Mon, 16 Nov 2020 14:23:11 +0100
 Subject: [PATCH] arm64: dts: rockchip: rename sdhci nodename to mmc on rk3399
@@ -2074,7 +2074,7 @@ index 7a9a7aca86c6..865729ec867f 100644
  		reg = <0x0 0xfe330000 0x0 0x10000>;
  		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH 0>;
 
-From 788de7c2c761d7d34879de0f31d46a26071318e7 Mon Sep 17 00:00:00 2001
+From a3c1dcd6f79ffbf29f14cf8d97a17d0c113b64c1 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:09 +0530
 Subject: [PATCH] arm64: dts: rockchip: Enable USB Host, OTG on px30-enagicam
@@ -2129,7 +2129,7 @@ index bd5bde989e8d..fbbdbb0a40af 100644
 +	status = "okay";
 +};
 
-From 2b8ed7f5f189cacd9465e725d80949993a4af67a Mon Sep 17 00:00:00 2001
+From 588353617f30d2a7ce1b9ba6b8daac2fd3c7f58f Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:10 +0530
 Subject: [PATCH] arm64: dts: rockchip: Enable LVDS panel on
@@ -2248,7 +2248,7 @@ index db22f776c68f..cdacd3483600 100644
  				regulator-name = "vcc5v0_host";
  				regulator-always-on;
 
-From 3d6d9cbc1bf596ac6f78d63ed8dbdf94849517ba Mon Sep 17 00:00:00 2001
+From fea98a305fea5b7359caf1c4a5a203c0170b697e Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:11 +0530
 Subject: [PATCH] dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
@@ -2292,7 +2292,7 @@ index 37fd456170d2..ef4544ad6f82 100644
          items:
            - const: engicam,px30-core-edimm2.2
 
-From 5125b003599a79b52ec2f9d7f4c56be4d65d9f9a Mon Sep 17 00:00:00 2001
+From a9fd5f2e8d3b27b5cd46014c563e09944e956047 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:12 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1"
@@ -2415,7 +2415,7 @@ index 000000000000..47aa30505a42
 +	status = "okay";
 +};
 
-From d22f3ec04013a401a7a6ac43ceab6cc9d6b0c2ae Mon Sep 17 00:00:00 2001
+From c8dd7795b4781bcd100e263bd6bcea57cf4dccc4 Mon Sep 17 00:00:00 2001
 From: Suniel Mahesh <sunil@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:13 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add WiFi support on px30-engicam
@@ -2537,7 +2537,7 @@ index e54d1e480daa..913444548b59 100644
 +	reset-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;
 +};
 
-From bd5babdc346d5b6e14e73f710eb7dceb7c353b34 Mon Sep 17 00:00:00 2001
+From 52ebf8f400b0eda0bda923fb06f2fc7c5d63ac46 Mon Sep 17 00:00:00 2001
 From: Suniel Mahesh <sunil@amarulasolutions.com>
 Date: Mon, 9 Nov 2020 23:40:14 +0530
 Subject: [PATCH] arm64: dts: rockchip: Add BT support on px30-engicam
@@ -2636,7 +2636,7 @@ index 913444548b59..d759478e1c84 100644
 +	enable-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
 +};
 
-From e885634c25872114d576907e82b682ac9826157c Mon Sep 17 00:00:00 2001
+From ae3d6a662eeb8259e23bee05648c94c5f97b2dc3 Mon Sep 17 00:00:00 2001
 From: Alexis Ballier <aballier@gentoo.org>
 Date: Thu, 22 Oct 2020 13:35:32 +0200
 Subject: [PATCH] arm64: dts: rockchip: Properly define the type C connector on
@@ -2763,7 +2763,7 @@ index 6163ae8063a7..ad7c4d00888f 100644
  
  &usbdrd3_1 {
 
-From cac94f9e5d1735e2c0fc37d164e7a24eb09a01cf Mon Sep 17 00:00:00 2001
+From fedebdb66a4cfd3685831f83e55b6b562c36c668 Mon Sep 17 00:00:00 2001
 From: Shunqian Zheng <zhengsq@rock-chips.com>
 Date: Tue, 20 Oct 2020 16:38:49 -0300
 Subject: [PATCH] arm64: dts: rockchip: add isp0 node for rk3399
@@ -2821,7 +2821,7 @@ index 865729ec867f..f5dee5f447bb 100644
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
 
-From 8cba14e3889a8c6695e90bdeb698a7998788b153 Mon Sep 17 00:00:00 2001
+From 8f501e29cd0029de7da8548c0ab717709a01c8e4 Mon Sep 17 00:00:00 2001
 From: Eddie Cai <eddie.cai.linux@gmail.com>
 Date: Tue, 20 Oct 2020 16:38:50 -0300
 Subject: [PATCH] arm64: dts: rockchip: add isp and sensors for Scarlet
@@ -2939,7 +2939,7 @@ index 60cd1c18cd4e..beee5fbb3443 100644
  	status = "okay";
  	clock-master;
 
-From 61526438d1bb6f241861b6caddffcdbde4092a09 Mon Sep 17 00:00:00 2001
+From ff8fd76e7482e5fd9695f505b9c6079bcc393404 Mon Sep 17 00:00:00 2001
 From: Vicente Bergas <vicencb@gmail.com>
 Date: Tue, 1 Dec 2020 16:41:30 +0100
 Subject: [PATCH] arm64: dts: rockchip: fix supplies on rk3399-rock-pi-4
@@ -2996,7 +2996,7 @@ index 678a336010bf..06df2397bbb4 100644
  					regulator-off-in-suspend;
  				};
 
-From befac22c7d52bd4b312cd00ed30716406a531661 Mon Sep 17 00:00:00 2001
+From d8bc550f8290ae4afcbb9eaa46aaa10867b1ca72 Mon Sep 17 00:00:00 2001
 From: Vicente Bergas <vicencb@gmail.com>
 Date: Tue, 1 Dec 2020 16:41:31 +0100
 Subject: [PATCH] arm64: dts: rockchip: fix I2S conflict on rk3399-rock-pi-4
@@ -3031,7 +3031,7 @@ index 06df2397bbb4..63b029a543c1 100644
  };
  
 
-From c46c72e0ec62b22655a178f3841b541956b3976d Mon Sep 17 00:00:00 2001
+From 4be36380ae5fc643977959a10acba1f59f29c84f Mon Sep 17 00:00:00 2001
 From: Vicente Bergas <vicencb@gmail.com>
 Date: Tue, 1 Dec 2020 16:41:32 +0100
 Subject: [PATCH] arm64: dts: rockchip: use USB host by default on

projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-next.patch

@@ -1,4 +1,4 @@
-From e701d077fd4d4c60d9a9d886665f91bf9e81372d Mon Sep 17 00:00:00 2001
+From b8d11c4d2da11b58b58ce4794a644ea6074680b7 Mon Sep 17 00:00:00 2001
 From: Sandy Huang <hjc@rock-chips.com>
 Date: Fri, 8 Jan 2021 12:06:27 +0100
 Subject: [PATCH] arm64: dts: rockchip: fix vopl iommu irq on px30
@@ -30,7 +30,7 @@ index 2695ea8cda14..64193292d26c 100644
  		clocks = <&cru ACLK_VOPL>, <&cru HCLK_VOPL>;
  		clock-names = "aclk", "iface";
 
-From 812e234c9503218da7a1bf328d130f7826054dd7 Mon Sep 17 00:00:00 2001
+From b24a3a7acba3235a5ea07101b3e819e9a176280b Mon Sep 17 00:00:00 2001
 From: Demetris Ierokipides <ierokipides.dem@gmail.com>
 Date: Fri, 8 Jan 2021 17:10:35 +0200
 Subject: [PATCH] ARM: dts: rockchip: add gpu node to rk3288-miqi
@@ -61,7 +61,7 @@ index cf54d5ffff2f..713f55e143c6 100644
  	ddc-i2c-bus = <&i2c5>;
  	status = "okay";
 
-From 2bdfcd8cbb80d7c1f617b780199117d68d80a015 Mon Sep 17 00:00:00 2001
+From edcb4e7500aeb2e74556f50aec1446494b16404b Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Sat, 19 Dec 2020 22:05:00 +0100
 Subject: [PATCH] arm64: dts: rockchip: assign a fixed index to mmc devices on
@@ -95,7 +95,7 @@ index db0d5c8e5f96..56b5ee7e54c4 100644
  		ethernet1 = &gmac2phy;
  	};
 
-From 9d48adb46a3a770ca2a9fd908aff32ced094ea58 Mon Sep 17 00:00:00 2001
+From e67c9a39505071c77ba7f4b0adecf1cd19b96503 Mon Sep 17 00:00:00 2001
 From: Jagan Teki <jagan@amarulasolutions.com>
 Date: Fri, 31 Jul 2020 21:33:24 +0530
 Subject: [PATCH] arm64: defconfig: Enable REGULATOR_MP8859
@@ -132,7 +132,7 @@ index 699c204090b8..9365213589bb 100644
  CONFIG_REGULATOR_PFUZE100=y
  CONFIG_REGULATOR_PWM=y
 
-From ce1b6881feca75f071dc2d90157c54d4f3977ce4 Mon Sep 17 00:00:00 2001
+From 427c81cdb8154bd171e415cc0c44a70896c522d7 Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Sun, 6 Dec 2020 11:37:08 +0100
 Subject: [PATCH] ARM: dts: rockchip: add QoS register compatibles for
@@ -209,7 +209,7 @@ index 859a7477909f..49bcdf46d03c 100644
  	};
  
 
-From 1a5c445dcef00ea302140df8db253669bcebb7e1 Mon Sep 17 00:00:00 2001
+From af4e1e298a705033088c36bd766d5b4ce7d81ace Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Sun, 6 Dec 2020 11:37:09 +0100
 Subject: [PATCH] ARM: dts: rockchip: add QoS register compatibles for rk3288
@@ -321,7 +321,7 @@ index 68d5a58cfe88..01ea1f170f77 100644
  	};
  
 
-From e73e7d1c7cf928b706c0f2d3eaf9fbf7c7b7205f Mon Sep 17 00:00:00 2001
+From 2af85aabe3375b91d0096188d98dbb18e2a0d9d0 Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Sun, 6 Dec 2020 11:37:10 +0100
 Subject: [PATCH] arm64: dts: rockchip: add QoS register compatibles for rk3399
@@ -499,7 +499,7 @@ index f5dee5f447bb..cd9fbd3cfcaf 100644
  	};
  
 
-From 96c2b52bf2175c5e3ee0bf37ac9fcfcb07d7517a Mon Sep 17 00:00:00 2001
+From 0fefb9cc8fa016a264d66110024916a6b8539cc4 Mon Sep 17 00:00:00 2001
 From: Johan Jonker <jbx6244@gmail.com>
 Date: Sun, 6 Dec 2020 11:37:11 +0100
 Subject: [PATCH] arm64: dts: rockchip: add QoS register compatibles for px30
@@ -647,7 +647,7 @@ index 64193292d26c..d8b673b486c9 100644
  	};
  
 
-From ee48fd6cdd11156b2bdf4f8f56280d3abe249300 Mon Sep 17 00:00:00 2001
+From 850b62955000677d1a11c4500a68588ea06872fb Mon Sep 17 00:00:00 2001
 From: Simon South <simon@simonsouth.net>
 Date: Wed, 30 Sep 2020 14:56:27 -0400
 Subject: [PATCH] arm64: dts: rockchip: Use only supported PCIe link speed on
@@ -681,7 +681,7 @@ index 06d48338c836..219b7507a10f 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&pcie_clkreqn_cpm>;
 
-From 2fa6252a57ffdbb0b31b5687953b868eb4fe11fb Mon Sep 17 00:00:00 2001
+From 7609f6470180b9342abac469c299ab486c070f8c Mon Sep 17 00:00:00 2001
 From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
 Date: Mon, 3 Aug 2020 00:42:31 +0900
 Subject: [PATCH] arm64: dts: rockchip: enable HDMI sound nodes for
@@ -839,7 +839,7 @@ index 86cfb5c50a94..c984662043da 100644
  
  &spi0 {
 
-From 2396b9c1b8eb91c552fc1186d7845911fed1650a Mon Sep 17 00:00:00 2001
+From 80b2c4090d255b4a8f6b7bdbf839876df337db8f Mon Sep 17 00:00:00 2001
 From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
 Date: Mon, 10 Aug 2020 18:16:19 +0900
 Subject: [PATCH] arm64: dts: rockchip: add SPDIF node for rk3399-rockpro64
@@ -905,7 +905,7 @@ index 6e553ff47534..58097245994a 100644
  	status = "okay";
  
 
-From 0e089a16f0d0f926491689e11d01a0bbc8b91f2f Mon Sep 17 00:00:00 2001
+From c4b252da0a7d6281d0d99c27a1c182f769a12652 Mon Sep 17 00:00:00 2001
 From: Marc Zyngier <maz@kernel.org>
 Date: Sat, 15 Aug 2020 13:51:12 +0100
 Subject: [PATCH] arm64: dts: rockchip: Fix PCIe DT properties on rk3399

projects/Rockchip/patches/linux/default/linux-0003-rockchip-from-list.patch

@@ -1,4 +1,4 @@
-From a2c7d649c4d8d083c50bb041afb72c44f6303c3f Mon Sep 17 00:00:00 2001
+From 4a40b9af1062466503462b3478cfc81dee430105 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 15:32:18 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: use correct vco_div_5 macro on
@@ -31,7 +31,7 @@ index 9ca20c947283..b0ac1d3ee390 100644
  
  	val = RK3328_SPREAD_SPECTRUM_MOD_DISABLE;
 
-From c8eed3a33d805f63465766f2b0ae75f3e824ec12 Mon Sep 17 00:00:00 2001
+From 93fd69bc11a0c66fce9a059a4fed130a0569c44a Mon Sep 17 00:00:00 2001
 From: Zheng Yang <zhengyang@rock-chips.com>
 Date: Sat, 10 Oct 2020 15:32:18 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: round fractal pixclock in rk3328
@@ -73,7 +73,7 @@ index b0ac1d3ee390..093d2334e8cd 100644
  
  static long inno_hdmi_phy_rk3328_clk_round_rate(struct clk_hw *hw,
 
-From 1f9e6c5cc70cb9fa6e3751b149d88ef7289b2783 Mon Sep 17 00:00:00 2001
+From 7105c460048cd6fa3c44e8bb1388586a303567a0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 15:32:19 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: remove unused no_c from rk3328
@@ -110,7 +110,7 @@ index 093d2334e8cd..06db69c8373e 100644
  
  		do_div(vco, (nd * (no_a == 1 ? no_b : no_a) * no_d * 2));
 
-From 97cae140efa904b9184f729f6a7de4b5ec48b4b0 Mon Sep 17 00:00:00 2001
+From 24b062d263ec48f050a5f73812a910780f9f5cdb Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 15:32:19 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: do not power on rk3328 post pll on
@@ -157,7 +157,7 @@ index 06db69c8373e..3a59a6da0440 100644
  
  	for (v = 0; v < 14; v++)
 
-From bfa07944b40b99cc9e23e808107b0a7d0f4cbfde Mon Sep 17 00:00:00 2001
+From 7349d485fab085341ce5f03700b859e911dc9919 Mon Sep 17 00:00:00 2001
 From: Huicong Xu <xhc@rock-chips.com>
 Date: Sat, 10 Oct 2020 15:32:20 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: force set_rate on power_on
@@ -245,7 +245,7 @@ index 3a59a6da0440..3719309ad0d0 100644
  	return 0;
  }
 
-From 3adb263b709113431ff97d17646c422293122e15 Mon Sep 17 00:00:00 2001
+From 0052cad55b3a5b7bdfe41f662bab90fad7f0b0f9 Mon Sep 17 00:00:00 2001
 From: Algea Cao <algea.cao@rock-chips.com>
 Date: Sat, 10 Oct 2020 15:32:20 +0000
 Subject: [PATCH] phy/rockchip: inno-hdmi: Support more pre-pll configuration
@@ -361,7 +361,7 @@ index 3719309ad0d0..bb8bdf5e3301 100644
  };
  
 
-From 70934586d1194bd7a5ef2ec0c81c7319b45daf39 Mon Sep 17 00:00:00 2001
+From 1e8f08c29a89a3c8ee2a4caef5743b7f9c6816bf Mon Sep 17 00:00:00 2001
 From: Peter Geis <pgwipeout@gmail.com>
 Date: Mon, 16 Nov 2020 15:17:33 +0000
 Subject: [PATCH] phy: rockchip: add rockchip usb3 innosilicon phy driver
@@ -857,7 +857,7 @@ index 000000000000..6e4aa2f0ba46
 +MODULE_DESCRIPTION("Rockchip USB 3 PHY driver");
 +MODULE_LICENSE("GPL v2");
 
-From 047efbf9fa61b63d9bc20f22c76ea3e67a49f2cb Mon Sep 17 00:00:00 2001
+From 5edc51fd7682f270c4e19d0277943bf41ca9a64a Mon Sep 17 00:00:00 2001
 From: Peter Geis <pgwipeout@gmail.com>
 Date: Mon, 16 Nov 2020 15:17:34 +0000
 Subject: [PATCH] usb: dwc3: add rockchip innosilicon usb3 glue layer
@@ -1183,7 +1183,7 @@ index 000000000000..7007ddbcbdae
 +MODULE_DESCRIPTION("DesignWare USB3 Rockchip Innosilicon Glue Layer");
 +MODULE_AUTHOR("Peter Geis <pgwipeout@gmail.com>");
 
-From ddc2e7643489b827c4d933f7145a6a0c5a7ca680 Mon Sep 17 00:00:00 2001
+From 1f6ba30b63c739b6c9c76b2dbd68e83095e038a3 Mon Sep 17 00:00:00 2001
 From: Peter Geis <pgwipeout@gmail.com>
 Date: Mon, 16 Nov 2020 15:17:35 +0000
 Subject: [PATCH] arm64: dts: rockchip: add rk3328 usb3 and usb3phy nodes
@@ -1279,7 +1279,7 @@ index 56b5ee7e54c4..72f34205fd20 100644
  		compatible = "arm,gic-400";
  		#interrupt-cells = <3>;
 
-From 2f018d8d16dca79078a66816490070bd97ddd882 Mon Sep 17 00:00:00 2001
+From 26c7d07e7537483905fe6a672232cf7790133916 Mon Sep 17 00:00:00 2001
 From: Peter Geis <pgwipeout@gmail.com>
 Date: Mon, 16 Nov 2020 15:17:36 +0000
 Subject: [PATCH] arm64: dts: rockchip: enable usb3 on rk3328-roc-cc board
@@ -1324,7 +1324,7 @@ index 19959bfba451..3ac876c08d61 100644
  	status = "okay";
  };
 
-From 633ca45797f43ada99df0cdc0cbd57093fc56ed5 Mon Sep 17 00:00:00 2001
+From 031a8498a8700bd8027d75df56f9d5af866d145b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 17 Feb 2019 22:14:38 +0000
 Subject: [PATCH] mmc: core: set initial signal voltage on power off

projects/Rockchip/patches/linux/default/linux-0010-v4l2-from-list.patch

@@ -1,4 +1,4 @@
-From 1bb6ee3818b2498bc6076e1d1e19d0ab9300e8c4 Mon Sep 17 00:00:00 2001
+From 8b65635fe4138a03f36cb9b909f6b4e81de61ba1 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:33 +0000
 Subject: [PATCH] media: rkvdec: h264: Fix reference frame_num wrap for second
@@ -33,7 +33,7 @@ index 7cc3b478a5f4..054d2e3eed67 100644
  			continue;
  		}
 
-From 489cc1e35036e0bca7a1d47d7b2e0b5ae432bf3a Mon Sep 17 00:00:00 2001
+From 1e1fba94233ca5cd793bea80c075b7d4402a02e8 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:34 +0000
 Subject: [PATCH] media: rkvdec: Ensure decoded resolution fit coded resolution
@@ -60,7 +60,7 @@ index d25c4a37e2af..b3e067031c83 100644
  				       &pix_mp->height,
  				       &coded_desc->frmsize);
 
-From b5f6aa3c9e10de3f67c567b0cda96538470029ed Mon Sep 17 00:00:00 2001
+From e13033dcecad3af45820802c7138761a903e487d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:34 +0000
 Subject: [PATCH] media: rkvdec: h264: Validate and use pic width and height in
@@ -128,7 +128,7 @@ index b3e067031c83..06fc58440cd3 100644
  	return 0;
  }
 
-From 66d25229f5b9eb4f3e4bd0085959546a368bc2f0 Mon Sep 17 00:00:00 2001
+From d100d0514c614e3dbb494db9cee495e8e4281a96 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:35 +0000
 Subject: [PATCH] media: rkvdec: h264: Fix bit depth wrap in pps packet
@@ -161,7 +161,7 @@ index d46424ba88e8..6536cf0d6054 100644
  	WRITE_PPS(sps->log2_max_frame_num_minus4, LOG2_MAX_FRAME_NUM_MINUS4);
  	WRITE_PPS(sps->max_num_ref_frames, MAX_NUM_REF_FRAMES);
 
-From 80d1a0b261701bae31e8134a62515de371a3dc93 Mon Sep 17 00:00:00 2001
+From de23966bda3f284d66c5f14e578c59b921ffc869 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:35 +0000
 Subject: [PATCH] media: rkvdec: h264: Do not override output buffer sizeimage
@@ -195,7 +195,7 @@ index 6536cf0d6054..bf632d45282b 100644
  }
  
 
-From 586ea81ae0aa1460d1254c0c2582198edc7a9a3d Mon Sep 17 00:00:00 2001
+From 846786ba47353964d074b3d8cd4ced8630562e36 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:35 +0000
 Subject: [PATCH] media: v4l2-common: Add helpers to calculate bytesperline and
@@ -324,7 +324,7 @@ index 3dc17ebe14fa..4102c373b48a 100644
  }
  EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt);
 
-From 3c324e26bcb846db37a27b897f778a3cd1ce2a22 Mon Sep 17 00:00:00 2001
+From 8edb607b6b0a3370fe28b1b5e35ecd01cd53aab6 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:36 +0000
 Subject: [PATCH] media: v4l2: Add NV15 and NV20 pixel formats
@@ -620,7 +620,7 @@ index 534eaa4d39bc..f21eba15ceae 100644
  #define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
  #define V4L2_PIX_FMT_NV21M   v4l2_fourcc('N', 'M', '2', '1') /* 21  Y/CrCb 4:2:0  */
 
-From 0eb43246390d241064a85fd6e87494a07216419c Mon Sep 17 00:00:00 2001
+From 6d70596d08bd5e83bfc7ec91ef2487eea16423c7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:36 +0000
 Subject: [PATCH] media: rkvdec: h264: Use bytesperline and buffer height to
@@ -665,7 +665,7 @@ index bf632d45282b..6f2d41b2e076 100644
  
  	if (sps->chroma_format_idc == 0)
 
-From f6cf51a6bb6a09099020ce9808768fae12931cd2 Mon Sep 17 00:00:00 2001
+From fe986faea5db691dda6b63f3d681f17c772998d5 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:37 +0000
 Subject: [PATCH] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper
@@ -736,7 +736,7 @@ index 06fc58440cd3..dc16bf8d57a9 100644
  	return 0;
  }
 
-From 1791908ad4ef99aa4e6054f7e75cc274ddeada14 Mon Sep 17 00:00:00 2001
+From d12f5e85ce258df07965441d609c321a53fe6238 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:37 +0000
 Subject: [PATCH] media: rkvdec: Lock capture pixel format in s_ctrl and s_fmt
@@ -889,7 +889,7 @@ index 77a137cca88e..e95c52e3168a 100644
  	struct v4l2_ctrl_handler ctrl_hdl;
  	struct rkvdec_dev *dev;
 
-From f7f8f5e4c78dce83a53218869da9a49d67620b12 Mon Sep 17 00:00:00 2001
+From eb2ba0433b38541aa4a231f559915cd0f9986071 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:37 +0000
 Subject: [PATCH] media: rkvdec: h264: Support High 10 and 4:2:2 profiles
@@ -995,7 +995,7 @@ index 6b2a2f4164b2..bd8ec2915fe9 100644
  
  static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = {
 
-From 5c4ee34ae7c5ff491601d236109f89df4f4ae422 Mon Sep 17 00:00:00 2001
+From 68c5e697048b29149089aee45547362a80284eaf Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 21:54:38 +0000
 Subject: [PATCH] media: rkvdec: h264: Support profile and level controls

projects/Rockchip/patches/linux/default/linux-0020-drm-from-5.11.patch

@@ -1,4 +1,4 @@
-From 553d877fd05921abc0860a3119ab154bd8ca7008 Mon Sep 17 00:00:00 2001
+From a65d599157434672923aa2100e38de9c3e5fdcf4 Mon Sep 17 00:00:00 2001
 From: Thomas Zimmermann <tzimmermann@suse.de>
 Date: Wed, 23 Sep 2020 12:21:51 +0200
 Subject: [PATCH] drm/rockchip: Convert to drm_gem_object_funcs
@@ -82,7 +82,7 @@ index 62e5d0970525..1cf4631461c9 100644
   */
  void rockchip_gem_free_object(struct drm_gem_object *obj)
 
-From c270a590320dd7a33e9ece80144d70e5821f7454 Mon Sep 17 00:00:00 2001
+From ef5187c01a38422facb8385a9fdb2bdca48b5063 Mon Sep 17 00:00:00 2001
 From: Thomas Zimmermann <tzimmermann@suse.de>
 Date: Mon, 28 Sep 2020 10:16:43 +0200
 Subject: [PATCH] drm/rockchip: Include <drm/drm_gem_cma_helper> for
@@ -125,7 +125,7 @@ index 1cf4631461c9..7d5ebb10323b 100644
  #include <drm/drm_vma_manager.h>
  
 
-From 28bc61a7143738a3f9a7d60b9ddc959720bbf2d3 Mon Sep 17 00:00:00 2001
+From c0d3455e8abdb62b4088d6b0833f722bea8856c4 Mon Sep 17 00:00:00 2001
 From: Qinglang Miao <miaoqinglang@huawei.com>
 Date: Mon, 21 Sep 2020 21:10:19 +0800
 Subject: [PATCH] drm/panfrost: simplify the return expression of
@@ -169,7 +169,7 @@ index bf7c34cfb84c..a83b2ff5837a 100644
  
  static void panfrost_reset_fini(struct panfrost_device *pfdev)
 
-From 71c6db9e7728371aa3f06eec239037d0bf6d43ba Mon Sep 17 00:00:00 2001
+From 0c18323036a4a28bc7be740d247dc117228e80eb Mon Sep 17 00:00:00 2001
 From: Qinglang Miao <miaoqinglang@huawei.com>
 Date: Mon, 21 Sep 2020 21:10:21 +0800
 Subject: [PATCH] drm/panfrost: simplify the return expression of
@@ -211,7 +211,7 @@ index 8ab025d0035f..913eaa6d0bc6 100644
  
  static void panfrost_devfreq_reset(struct panfrost_devfreq *pfdevfreq)
 
-From e3e33f48d0881c9e2cb65733583c42422e14ee67 Mon Sep 17 00:00:00 2001
+From 730780b7c9d26a7dd5a103f17ceb3035d1f58264 Mon Sep 17 00:00:00 2001
 From: Rikard Falkeborn <rikard.falkeborn@gmail.com>
 Date: Sun, 4 Oct 2020 22:06:53 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: Constify dw_hdmi_i2s_ops
@@ -242,7 +242,7 @@ index 9fef6413741d..feb04f127b55 100644
  	.audio_startup  = dw_hdmi_i2s_audio_startup,
  	.audio_shutdown	= dw_hdmi_i2s_audio_shutdown,
 
-From 221b37c6a6f86adbfa3714b345124c0495e95d48 Mon Sep 17 00:00:00 2001
+From 40ec605e1723e52775bbba80b36870d7dd7e7019 Mon Sep 17 00:00:00 2001
 From: Liu Shixin <liushixin2@huawei.com>
 Date: Sat, 19 Sep 2020 18:08:50 +0800
 Subject: [PATCH] drm/lima: simplify the return expression of
@@ -282,7 +282,7 @@ index bbe02817721b..5914442936ed 100644
  
  static void lima_devfreq_reset(struct lima_devfreq *devfreq)
 
-From 0bf1a356f4c76fc74c4bdebd85b83ae995abe5da Mon Sep 17 00:00:00 2001
+From 6d6bd7b07ce09052d1b1d4116eb866d18c3cbb8a Mon Sep 17 00:00:00 2001
 From: Lee Jones <lee.jones@linaro.org>
 Date: Fri, 13 Nov 2020 13:49:13 +0000
 Subject: [PATCH] drm/lima/lima_drv: Demote kernel-doc formatting abuse
@@ -317,7 +317,7 @@ index ab460121fd52..065c80c14d10 100644
   *
   * - 1.1.0 - add heap buffer support
 
-From abbee7f2aef747690b1ca8bc7a5811f06f60f4b2 Mon Sep 17 00:00:00 2001
+From 9d003fb17fd9a2c55debe6c7a96003093f4c2429 Mon Sep 17 00:00:00 2001
 From: Lee Jones <lee.jones@linaro.org>
 Date: Fri, 13 Nov 2020 13:49:21 +0000
 Subject: [PATCH] drm/lima/lima_sched: Remove unused and unnecessary variable
@@ -369,7 +369,7 @@ index dc6df9e9a40d..3f5075bd158f 100644
  	pipe->current_task = task;
  
 
-From 6c3aa06f1c88d508abbc0ce48ceefc8f6f44dcb5 Mon Sep 17 00:00:00 2001
+From 4748c72bc711c423127ceb78220d696ee2a170a8 Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <viresh.kumar@linaro.org>
 Date: Wed, 28 Oct 2020 12:14:21 +0530
 Subject: [PATCH] drm/lima: Unconditionally call dev_pm_opp_of_remove_table()
@@ -425,7 +425,7 @@ index 5eed2975a375..2d9b3008ce77 100644
  	ktime_t busy_time;
  	ktime_t idle_time;
 
-From 9436bee60f920685c779029c39a8f79bbb9c633a Mon Sep 17 00:00:00 2001
+From d007ec94509b760c77f9509d9cc58921d1c2aa34 Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <viresh.kumar@linaro.org>
 Date: Fri, 6 Nov 2020 12:18:39 +0530
 Subject: [PATCH] drm/lima: dev_pm_opp_put_*() accepts NULL argument
@@ -464,7 +464,7 @@ index da7099d20bd5..5686ad4aaf7c 100644
  
  int lima_devfreq_init(struct lima_device *ldev)
 
-From 622fc4f4e82d4670153fc4dc35825769f8b429b4 Mon Sep 17 00:00:00 2001
+From d763174f11ce320a8ac8a583bfc0cc7268fe7289 Mon Sep 17 00:00:00 2001
 From: Robin Murphy <robin.murphy@arm.com>
 Date: Tue, 22 Sep 2020 15:16:49 +0100
 Subject: [PATCH] drm/panfrost: Support cache-coherent integrations
@@ -546,102 +546,3 @@ index 776448c527ea..be8d68fb0e11 100644
  		.tlb		= &mmu_tlb_ops,
  		.iommu_dev	= pfdev->dev,
  	};
-
-From db5daacf2829ff99d89c949b1e116210e5c8f2be Mon Sep 17 00:00:00 2001
-From: Steven Price <steven.price@arm.com>
-Date: Thu, 29 Oct 2020 17:00:47 +0000
-Subject: [PATCH] drm/panfrost: Don't corrupt the queue mutex on open/close
-
-The mutex within the panfrost_queue_state should have the lifetime of
-the queue, however it was erroneously initialised/destroyed during
-panfrost_job_{open,close} which is called every time a client
-opens/closes the drm node.
-
-Move the initialisation/destruction to panfrost_job_{init,fini} where it
-belongs.
-
-Fixes: 1a11a88cfd9a ("drm/panfrost: Fix job timeout handling")
-Signed-off-by: Steven Price <steven.price@arm.com>
-Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
-Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20201029170047.30564-1-steven.price@arm.com
----
- drivers/gpu/drm/panfrost/panfrost_job.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
-index 1ce2001106e5..517dfb247a80 100644
---- a/drivers/gpu/drm/panfrost/panfrost_job.c
-+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
-@@ -617,6 +617,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)
- 	}
- 
- 	for (j = 0; j < NUM_JOB_SLOTS; j++) {
-+		mutex_init(&js->queue[j].lock);
-+
- 		js->queue[j].fence_context = dma_fence_context_alloc(1);
- 
- 		ret = drm_sched_init(&js->queue[j].sched,
-@@ -647,8 +649,10 @@ void panfrost_job_fini(struct panfrost_device *pfdev)
- 
- 	job_write(pfdev, JOB_INT_MASK, 0);
- 
--	for (j = 0; j < NUM_JOB_SLOTS; j++)
-+	for (j = 0; j < NUM_JOB_SLOTS; j++) {
- 		drm_sched_fini(&js->queue[j].sched);
-+		mutex_destroy(&js->queue[j].lock);
-+	}
- 
- }
- 
-@@ -660,7 +664,6 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv)
- 	int ret, i;
- 
- 	for (i = 0; i < NUM_JOB_SLOTS; i++) {
--		mutex_init(&js->queue[i].lock);
- 		sched = &js->queue[i].sched;
- 		ret = drm_sched_entity_init(&panfrost_priv->sched_entity[i],
- 					    DRM_SCHED_PRIORITY_NORMAL, &sched,
-@@ -677,10 +680,8 @@ void panfrost_job_close(struct panfrost_file_priv *panfrost_priv)
- 	struct panfrost_job_slot *js = pfdev->js;
- 	int i;
- 
--	for (i = 0; i < NUM_JOB_SLOTS; i++) {
-+	for (i = 0; i < NUM_JOB_SLOTS; i++)
- 		drm_sched_entity_destroy(&panfrost_priv->sched_entity[i]);
--		mutex_destroy(&js->queue[i].lock);
--	}
- }
- 
- int panfrost_job_is_idle(struct panfrost_device *pfdev)
-
-From 44850d0b1a20313d1a22964ccf4fcb9d611c3f9b Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@collabora.com>
-Date: Sun, 1 Nov 2020 18:38:17 +0100
-Subject: [PATCH] drm/panfrost: Remove unused variables in panfrost_job_close()
-
-Commit a17d609e3e21 ("drm/panfrost: Don't corrupt the queue mutex on
-open/close") left unused variables behind, thus generating a warning
-at compilation time. Remove those variables.
-
-Fixes: a17d609e3e21 ("drm/panfrost: Don't corrupt the queue mutex on open/close")
-Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
-Reviewed-by: Steven Price <steven.price@arm.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20201101173817.831769-1-boris.brezillon@collabora.com
----
- drivers/gpu/drm/panfrost/panfrost_job.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
-index 517dfb247a80..04e6f6f9b742 100644
---- a/drivers/gpu/drm/panfrost/panfrost_job.c
-+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
-@@ -676,8 +676,6 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv)
- 
- void panfrost_job_close(struct panfrost_file_priv *panfrost_priv)
- {
--	struct panfrost_device *pfdev = panfrost_priv->pfdev;
--	struct panfrost_job_slot *js = pfdev->js;
- 	int i;
- 
- 	for (i = 0; i < NUM_JOB_SLOTS; i++)

projects/Rockchip/patches/linux/default/linux-0021-drm-from-list.patch

@@ -1,4 +1,4 @@
-From 7f65dfa79e600df193a274157794705d61302ffe Mon Sep 17 00:00:00 2001
+From 82ad763fb8892af550a264e731c372d5ce6e0df5 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 22:30:13 +0000
 Subject: [PATCH] drm: drm_fourcc: add NV20 and NV30 YUV formats
@@ -56,7 +56,7 @@ index 82f327801267..d8e6159213dc 100644
  /*
   * 2 plane YCbCr MSB aligned
 
-From 5c761a6923ab956a6c1a7c570628c344055e3e85 Mon Sep 17 00:00:00 2001
+From 44971d433dab751aff9975c7b0a3d98d9f3cf702 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 6 Jul 2020 22:30:13 +0000
 Subject: [PATCH] drm: rockchip: add NV15, NV20 and NV30 support

projects/Rockchip/patches/linux/default/linux-1000-export-mm_trace_rss_stat.patch

@@ -1,12 +0,0 @@
-diff --git a/mm/memory.c b/mm/memory.c
-index 606da18..8429abc 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -158,6 +158,7 @@
- {
- 	trace_rss_stat(mm, member, count);
- }
-+EXPORT_SYMBOL(mm_trace_rss_stat);
- 
- #if defined(SPLIT_RSS_COUNTING)
- 

projects/Rockchip/patches/linux/default/linux-1001-drm-rockchip.patch

@@ -1,4 +1,4 @@
-From c86baca2adad389d6601855070336bfccd6644bf Mon Sep 17 00:00:00 2001
+From b8c31533452c976e04d239bdbad7c2393f728391 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 15 Jul 2020 15:24:47 +0000
 Subject: [PATCH] drm/rockchip: vop: fix crtc duplicate state
@@ -30,7 +30,7 @@ index eb663e25ad9e..818195594705 100644
  		return NULL;
  
 
-From af26aac9883dc8f9e93d48f8dd97974c19b55c8a Mon Sep 17 00:00:00 2001
+From 8d23aed38c07e128c8e97cb7a979ad3f510ab79c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 May 2020 16:51:31 +0000
 Subject: [PATCH] drm/rockchip: vop: filter modes outside 0.5% pixel clock
@@ -119,7 +119,7 @@ index 818195594705..77ae88a94c55 100644
  	.atomic_check = vop_crtc_atomic_check,
  	.atomic_begin = vop_crtc_atomic_begin,
 
-From f66de7db8568a06bf3251837bc89fb3b73f4b2c9 Mon Sep 17 00:00:00 2001
+From be33ac8e021f8d2bbbb7ac507a356cf0f54ef998 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 15:15:50 +0000
 Subject: [PATCH] drm/rockchip: vop: filter interlaced modes
@@ -147,7 +147,7 @@ index 77ae88a94c55..e27314249691 100644
  	if (rounded_rate < 0)
  		return MODE_NOCLOCK;
 
-From 0ecaa96190a23bebd74d3a33eca79de3c50a8f56 Mon Sep 17 00:00:00 2001
+From 0d3b3e66b77697492f586dee7f1a636c8c3d2a97 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 14:57:30 +0000
 Subject: [PATCH] drm/rockchip: vop: define max output resolution supported
@@ -243,7 +243,7 @@ index 2c55e1852c3d..cf87361108a0 100644
  	.common = &rk3328_common,
  	.modeset = &rk3328_modeset,
 
-From 6177761486226484a9ea82c205844a3addcdeb07 Mon Sep 17 00:00:00 2001
+From 2df1db483dbc4382afdd068c92d948c5894b86b9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 11:46:16 +0000
 Subject: [PATCH] drm/rockchip: vop: filter modes above max output supported
@@ -299,7 +299,7 @@ index e27314249691..b15ee823039e 100644
  	 * Clock craziness.
  	 *
 
-From d6041e485e44ea27ce178238b20c120650ec0750 Mon Sep 17 00:00:00 2001
+From 2b982bc0980b1e07a16f95dad40dfbdb7efc8cdd Mon Sep 17 00:00:00 2001
 From: Yakir Yang <ykk@rock-chips.com>
 Date: Mon, 11 Jul 2016 19:05:39 +0800
 Subject: [PATCH] drm/rockchip: dw_hdmi: adjust cklvl & txlvl for RF/EMI
@@ -353,7 +353,7 @@ index 23de359a1dec..f78851e7ef16 100644
  	{ ~0UL,	     0x0000, 0x0000, 0x0000}
  };
 
-From 63652150cc73fc1d7a1d751799619d5b5fc7e722 Mon Sep 17 00:00:00 2001
+From 742e3b1f32865fc47c1a9972ece0f674a2fe8711 Mon Sep 17 00:00:00 2001
 From: Nickey Yang <nickey.yang@rock-chips.com>
 Date: Mon, 13 Feb 2017 15:40:29 +0800
 Subject: [PATCH] drm/rockchip: dw_hdmi: add phy_config for 594Mhz pixel clock
@@ -379,7 +379,7 @@ index f78851e7ef16..a308adb56d2f 100644
  };
  
 
-From 07f933df000843378421c5fa12484227e05bd52b Mon Sep 17 00:00:00 2001
+From 4797a1b5012f84c96a91bda162df85c15d8648f5 Mon Sep 17 00:00:00 2001
 From: Douglas Anderson <dianders@chromium.org>
 Date: Mon, 11 Jul 2016 19:05:36 +0800
 Subject: [PATCH] drm/rockchip: dw_hdmi: Set cur_ctr to 0 always
@@ -424,7 +424,7 @@ index a308adb56d2f..5b273f26f177 100644
  	}
  };
 
-From de579556c521aa66b60cab22b9e6161a98d172ba Mon Sep 17 00:00:00 2001
+From affc6bdd078237e4985809510bbe48027e1893b3 Mon Sep 17 00:00:00 2001
 From: Douglas Anderson <dianders@chromium.org>
 Date: Mon, 11 Jul 2016 19:05:42 +0800
 Subject: [PATCH] drm/rockchip: dw_hdmi: Use auto-generated tables
@@ -609,7 +609,7 @@ index 5b273f26f177..b5d2cdaa24fa 100644
  	}
  };
 
-From 2588e01b10b0f41a5245f11a857dd3c0d0d710ea Mon Sep 17 00:00:00 2001
+From 138a8ff48453b90953ffcd33c7b9651e11d92b85 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 8 Jan 2020 21:07:52 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: limit tmds to 340mhz
@@ -656,7 +656,7 @@ index b5d2cdaa24fa..5f7ab8e6bb72 100644
  
  static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)
 
-From f675144085ff4d8a542b2af0b64bb40adeeea223 Mon Sep 17 00:00:00 2001
+From 57d8a618f0660c1f3ef7b58c4eef4a6eef615574 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 May 2020 22:36:23 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: limit resolution to 3840x2160
@@ -680,7 +680,7 @@ index 5f7ab8e6bb72..0e7ca368314d 100644
  
  static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)
 
-From 91c9009079bb18c957de8e5b0734ea72e06bf584 Mon Sep 17 00:00:00 2001
+From b6dc188ade16245c10b2014bd062158ce8313e81 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 8 Jan 2020 21:07:49 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: allow high tmds bit rates
@@ -706,7 +706,7 @@ index 0e7ca368314d..6f7641fbe6cc 100644
  }
  
 
-From e088ac1e106ca08f19ed7e121ec4338651a80f50 Mon Sep 17 00:00:00 2001
+From c0252b7948385d75ef282cef84b1effe18966486 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 8 Jan 2020 21:07:52 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: remove unused plat_data on
@@ -745,7 +745,7 @@ index 6f7641fbe6cc..cc20a83fa9b8 100644
  	.phy_ops = &rk3328_hdmi_phy_ops,
  	.phy_name = "inno_dw_hdmi_phy2",
 
-From 32b6d7962f1df9b3bc2af2485dc32a54772c27ec Mon Sep 17 00:00:00 2001
+From b2050e98ffc8bf954f70a6728802c7f77e1a878e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 10:16:32 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: encoder error handling
@@ -811,7 +811,7 @@ index cc20a83fa9b8..fd614c8a3486 100644
  }
  
 
-From 8d7180b3ff4733269c4465dd2bb2433f762cdf75 Mon Sep 17 00:00:00 2001
+From 33bc9ea094d95e41270658a188f7a64585951d42 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 8 Jan 2020 21:07:50 +0000
 Subject: [PATCH] clk: rockchip: set parent rate for DCLK_VOP clock on rk3228
@@ -835,7 +835,7 @@ index 47d6482dda9d..a2b4d5487514 100644
  
  	FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
 
-From 3fa9c4af2ba74a77b9e1a63a587e61b189f7860e Mon Sep 17 00:00:00 2001
+From 19587f6585259f32b32cb868269366bd6f873f33 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 14:32:21 +0000
 Subject: [PATCH] drm/rockchip: vop: split rk3288 vop
@@ -892,7 +892,7 @@ index cf87361108a0..05ade8ea962f 100644
  	  .data = &rk3368_vop },
  	{ .compatible = "rockchip,rk3366-vop",
 
-From 49ea3a266d0867e760bae9bc1310b6eff1f31c43 Mon Sep 17 00:00:00 2001
+From d266116ccaa1810cbf0d528b6d6ac390bfc922dd Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 14:33:30 +0000
 Subject: [PATCH] ARM: dts: rockchip: split rk3288 vop
@@ -925,7 +925,7 @@ index 01ea1f170f77..3575dea1ee29 100644
  		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
 
-From 99960094869486ec89fb1aae483db0bf9629228a Mon Sep 17 00:00:00 2001
+From 3c30b7d610b8d68907f9874b6311d8c45410d02e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 18:00:44 +0000
 Subject: [PATCH] drm/bridge: dw-hdmi: add mtmdsclock parameter to phy
@@ -1003,7 +1003,7 @@ index ea34ca146b82..4f61ede6486d 100644
  
  struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
 
-From a3824d58ac9d6ab774b096a9cc78c5e386f27703 Mon Sep 17 00:00:00 2001
+From 1935f408ce2264ff9ab4be03d61ea7c86d9388f1 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 21:34:48 +0000
 Subject: [PATCH] drm/bridge: dw-hdmi: support configuring phy for deep color
@@ -1063,7 +1063,7 @@ index 50199329ad6f..2581789178c7 100644
  
  	dw_hdmi_phy_i2c_write(hdmi, 0, HDMI_3D_TX_PHY_PLLPHBYCTRL);
 
-From 3ea359254a9fd83d4bb88febfeff4ec053ca2251 Mon Sep 17 00:00:00 2001
+From aeeed2820e5c02d65c63e1a4d18b20f79561212a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 22:25:15 +0000
 Subject: [PATCH] drm/bridge: dw-hdmi: add mpll_cfg_420 for ycbcr420 mode
@@ -1102,7 +1102,7 @@ index 4f61ede6486d..0ebe01835d2a 100644
  	const struct dw_hdmi_phy_config *phy_config;
  	int (*configure_phy)(struct dw_hdmi *hdmi, void *data,
 
-From bf5ae7b3aa6b108f5346ead89ae2f0b7c0be8ada Mon Sep 17 00:00:00 2001
+From 2202e32e62d3dc8d7566887427e23675296eb50e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 15 Jul 2020 09:49:21 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: mode_valid: allow 420 clock rate
@@ -1143,7 +1143,7 @@ index fd614c8a3486..c22add144cf4 100644
  	encoder = &hdmi->encoder;
  
 
-From 50c0ad01ff4dcff17fa87fb378f5214e37df572c Mon Sep 17 00:00:00 2001
+From d56e609be90b7261040f94d0356c30adae68f7ab Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Jul 2020 22:26:19 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: add YCbCr420 mpll cfg for rk3399
@@ -1213,7 +1213,7 @@ index c22add144cf4..1e558af2c9b2 100644
  	.phy_config = rockchip_phy_config,
  	.phy_data = &rk3399_chip_data,
 
-From 22eeecd451b46dba081deea74c2613a339619f1c Mon Sep 17 00:00:00 2001
+From 94976e92fdeef9d37a3f17dcf4d704c913b7ce19 Mon Sep 17 00:00:00 2001
 From: Shunqing Chen <csq@rock-chips.com>
 Date: Wed, 15 Jul 2020 15:19:11 +0800
 Subject: [PATCH] drm/rockchip: dw-hdmi: add YCbCr420 mpll cfg for rk3288w
@@ -1284,7 +1284,7 @@ index 1e558af2c9b2..6dbd0e422ca1 100644
  	.phy_config = rockchip_phy_config,
  	.phy_data = &rk3288_chip_data,
 
-From 9da14af9655198b1f10d8f06a5b1f0995e578a48 Mon Sep 17 00:00:00 2001
+From c15ee8f8d363e71a62afb95e5b7bdc59892a3caf Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 20 Dec 2019 08:12:42 +0000
 Subject: [PATCH] drm/rockchip: dw-hdmi: add bridge and switch to
@@ -1490,7 +1490,7 @@ index 6dbd0e422ca1..510ae5d5f133 100644
  }
  
 
-From 8efac3d1616d43baa58ea7e1e06a93d31abb014d Mon Sep 17 00:00:00 2001
+From 779712b530c4353b4b83c755108b86a9808309db Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 9 Oct 2020 15:24:53 +0000
 Subject: [PATCH] drm/rockchip: vop: create planes in window order
@@ -1562,7 +1562,7 @@ index b15ee823039e..def4c592b75f 100644
  
  	port = of_get_child_by_name(dev->of_node, "port");
 
-From a3890216ecafda474fcd3fda529f1177b682dbe9 Mon Sep 17 00:00:00 2001
+From 3f903a4d812066e582b6658573b16c1fc558f25a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 9 Oct 2020 15:29:27 +0000
 Subject: [PATCH] drm/rockchip: vop: add immutable zpos property
@@ -1618,7 +1618,7 @@ index def4c592b75f..1dd8bf5ff4be 100644
  			primary = plane;
  		else if (plane->type == DRM_PLANE_TYPE_CURSOR)
 
-From a54a460f95ac032ae621695a27362b9bec3a3d52 Mon Sep 17 00:00:00 2001
+From c2fa8a49fbbcec290b1aa8c76125c254cca48844 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 10 Oct 2020 09:20:44 +0000
 Subject: [PATCH] drm/rockchip: vop: add plane color properties
@@ -1687,7 +1687,7 @@ index 1dd8bf5ff4be..5f89b51ce891 100644
  			primary = plane;
  		else if (plane->type == DRM_PLANE_TYPE_CURSOR)
 
-From be7e186bbe47bf56f11460ea9f9def9bb922df4e Mon Sep 17 00:00:00 2001
+From 2d0ecb95be7651cec64b039dac4db3bb2edb6f7c Mon Sep 17 00:00:00 2001
 From: Nickey Yang <nickey.yang@rock-chips.com>
 Date: Mon, 17 Jul 2017 16:35:34 +0800
 Subject: [PATCH] HACK: clk: rockchip: rk3288: dedicate npll for vopb and hdmi
@@ -1738,7 +1738,7 @@ index 93c794695c46..db6c8bbb35f4 100644
  			RK3288_CLKGATE_CON(3), 1, GFLAGS),
  	COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,
 
-From 0022fe5e0074a3bb71baf175af08ae54a33824a1 Mon Sep 17 00:00:00 2001
+From ae753af7bed0ba40fba859f31084520460493ad2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 14:51:14 +0200
 Subject: [PATCH] HACK: clk: rockchip: rk3288: use npll table to to improve
@@ -1793,7 +1793,7 @@ index db6c8bbb35f4..426309f5dd44 100644
  
  static struct clk_div_table div_hclk_cpu_t[] = {
 
-From c2932a004f3bfe0db020bd9e2a6e4967eab48313 Mon Sep 17 00:00:00 2001
+From 4a8e8c055de03a50dadcfd979a99beaff947cddc Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 28 Oct 2018 21:43:01 +0100
 Subject: [PATCH] HACK: clk: rockchip: rk3288: add more npll clocks
@@ -1845,7 +1845,7 @@ index 426309f5dd44..b3247a3a7290 100644
  };
  
 
-From 53449cc453ac4eebebea84efd6d8694eed1d0365 Mon Sep 17 00:00:00 2001
+From 76d67146a1eac8a188fe5646547fd0bc39e6b66e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 25 May 2020 20:36:45 +0000
 Subject: [PATCH] HACK: clk: rockchip: rk3399: dedicate vpll for vopb and hdmi
@@ -1936,7 +1936,7 @@ index 7df2f1e00347..d39d9ea39aca 100644
  			RK3399_CLKGATE_CON(10), 12, GFLAGS),
  
 
-From 93cfe23ab3faabc6905900be57ffecf0644711c3 Mon Sep 17 00:00:00 2001
+From 92d9cf4e6c2767c8c5aa8d97e684f2f77d950e7d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 19 Jul 2020 16:35:11 +0000
 Subject: [PATCH] HACK: dts: rockchip: do not use vopl for hdmi
@@ -2001,7 +2001,7 @@ index a855805649ef..418d16b0b648 100644
  		};
  	};
 
-From 7f4418d9c9b277966153bd88bf8543cc750ba5e2 Mon Sep 17 00:00:00 2001
+From 07203c89545ff7ec74cb8ccc87fb91810544e4a2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 20 Dec 2019 08:12:43 +0000
 Subject: [PATCH] WIP: drm/bridge: dw-hdmi: limit mode and bus format to
@@ -2230,7 +2230,7 @@ index 6d319b95b992..c2425d7fc465 100644
  		mode_status = pdata->mode_valid(hdmi, pdata->priv_data, info,
  						mode);
 
-From 6bd50413f8df7ff8f30dbf94489624ffe8e53fdd Mon Sep 17 00:00:00 2001
+From da41048fb13e41ca4caffef3584c543a0ce8c49d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 20 Dec 2019 08:12:42 +0000
 Subject: [PATCH] WIP: drm/rockchip: dw_hdmi: add 10-bit rgb bus format
@@ -2348,7 +2348,7 @@ index e33c2dcd0d4b..03944e08b6c7 100644
  #define to_rockchip_crtc_state(s) \
  		container_of(s, struct rockchip_crtc_state, base)
 
-From a6b6713b53e019176f2c1c7c4140f0d498066f25 Mon Sep 17 00:00:00 2001
+From 5a6355251e1b77b200291d48773f2b7693462f13 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Dec 2019 23:42:44 +0000
 Subject: [PATCH] WIP: drm: dw-hdmi: add content type connector property
@@ -2399,7 +2399,7 @@ index c2425d7fc465..f86b8fa40ab6 100644
  		drm_object_attach_property(&connector->base,
  			connector->dev->mode_config.hdr_output_metadata_property, 0);
 
-From 97e0c955f0b11f528a3369324bdb74c656989784 Mon Sep 17 00:00:00 2001
+From e388bd5e64b5bb34bd50710b01a57f48df6f9ca7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 20 Dec 2019 08:12:43 +0000
 Subject: [PATCH] WIP: drm/rockchip: add yuv444 support
@@ -2611,7 +2611,7 @@ index 05ade8ea962f..f276ef4b3f64 100644
  
  static const struct vop_intr rk3328_vop_intr = {
 
-From 4c8a9c260b7d5de435bc68f84e4a81e25c5d597e Mon Sep 17 00:00:00 2001
+From e9bebfae3a0d24b4d78ff4485ccad50c4dbe009c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 20 Dec 2019 08:12:43 +0000
 Subject: [PATCH] WIP: drm/rockchip: add yuv420 support
@@ -2780,7 +2780,7 @@ index f276ef4b3f64..8c99cc2a7eda 100644
  	.dsp_out_yuv = VOP_REG(RK3328_POST_SCL_CTRL, 0x1, 2),
  	.dsp_background = VOP_REG(RK3328_DSP_BG, 0xffffffff, 0),
 
-From 335e1bd47a2d0db95907753deb80a6f29fbc1d32 Mon Sep 17 00:00:00 2001
+From 782e7df70a432c1dfb7ce40f534b561485206c7f Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sat, 15 Aug 2020 23:20:34 +0200
 Subject: [PATCH] drm/rockchip: enable ycbcr_420_allowed and ycbcr_444_allowed
@@ -2811,7 +2811,7 @@ index 9fe690570e3d..bccdbb3e0a54 100644
  
  static struct rockchip_hdmi_chip_data rk3288_chip_data = {
 
-From 825906fc0f83ac7d9fe19bd02063f2e1738f1726 Mon Sep 17 00:00:00 2001
+From 0cb659fa323784a258839d4b86d90e6ed920059e Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Mon, 4 Jan 2021 22:38:26 +0100
 Subject: [PATCH] drm/rockchip: seperate mode clock validation
@@ -2863,7 +2863,7 @@ index bccdbb3e0a54..a612bf3da9ee 100644
  }
  
 
-From c75dca36b0d16f2a3740fcd0d16519a244d3720f Mon Sep 17 00:00:00 2001
+From b6c2c118e50f55b56036aab4dced57b8bd27d6ae Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sat, 15 Aug 2020 21:11:08 +0200
 Subject: [PATCH] !fixup drm/rockchip: rk3368's vop does not support 10-bit
@@ -2889,7 +2889,7 @@ index 8c99cc2a7eda..9ca9fff0d359 100644
  	.enable = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 0),
  	.format = VOP_REG(RK3368_WIN0_CTRL0, 0x7, 1),
 
-From 5f8d264498ae4f92b7e66fcc0db03fef02c4b529 Mon Sep 17 00:00:00 2001
+From 918ce1031f86f53a017670e38d7da2986e0d05b5 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Wed, 14 Oct 2020 16:42:05 +0100
 Subject: [PATCH] drm/rockchip: split rk3328 vop for 10-bit support
@@ -2944,7 +2944,7 @@ index 9ca9fff0d359..e34482c3d2be 100644
  };
  
 
-From 3da4ffc999ca999789d1834f45494396cf1dff60 Mon Sep 17 00:00:00 2001
+From b3928f654f3e4fb6a4266abc01afdb91bc6eb5a2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Nov 2017 11:09:39 +0100
 Subject: [PATCH] rockchip: vop: force skip lines if image too big
@@ -3000,7 +3000,7 @@ index d5048c111b82..c0245f5daeb6 100644
  
  		for (i = 0; i < NUM_YUV2YUV_COEFFICIENTS; i++) {
 
-From cbd53e07eca0e28b8f425fca00ae0b0703ae1aee Mon Sep 17 00:00:00 2001
+From 90d53e7362ee4b9d9ce13a643c491ee1177df526 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 8 Jan 2020 21:07:51 +0000
 Subject: [PATCH] arm64: dts: rockchip: increase vop clock rate on rk3328

projects/Rockchip/patches/linux/default/linux-1002-v4l2-rockchip.patch

@@ -1,4 +1,4 @@
-From 21616471f5cec9044620089999b23c53d2ddeb97 Mon Sep 17 00:00:00 2001
+From f675d4c92c304ab18b2d35495ad988a5097f7570 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 10:18:16 +0000
 Subject: [PATCH] WIP: media: rkvdec: continue to gate clock when decoding
@@ -34,7 +34,7 @@ index 87987a782d75..a1c33905970d 100644
  		rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR);
  	}
 
-From a2324e786890f3f2d41df537fb8208dd49fafd69 Mon Sep 17 00:00:00 2001
+From d7b43acd1c553dd7db2857e788d9181e0bf46807 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 10:16:01 +0000
 Subject: [PATCH] WIP: media: rkvdec: pm runtime dont use autosuspend before
@@ -62,7 +62,7 @@ index a1c33905970d..8c2ff05e01f7 100644
  }
  
 
-From 3ef8eba5dee33aaa0d0e2c56c44b4fd211b67d6b Mon Sep 17 00:00:00 2001
+From 958084181228d25b2e62f3a29974050d4aae6d74 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 11:23:04 +0000
 Subject: [PATCH] WIP: media: rkvdec: h264: return early when no reference
@@ -120,7 +120,7 @@ index c115cd362a7f..d9a2fd9386e2 100644
  			if (idx >= ARRAY_SIZE(dec_params->dpb))
  				continue;
 
-From bfa9384246a28120cc30e369b07bab5538a49c5c Mon Sep 17 00:00:00 2001
+From 6468b5ada5761e13da563207de76b49cc5481763 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 14:42:27 +0000
 Subject: [PATCH] WIP: media: rkvdec: h264: add field decoding support
@@ -237,7 +237,7 @@ index d9a2fd9386e2..d4f27ef7addd 100644
  	writel_relaxed(reg, rkvdec->regs + RKVDEC_REG_CUR_POC0);
  
 
-From d8c26ae5339462b975d58403d7457283db3f2f82 Mon Sep 17 00:00:00 2001
+From d79b22857b95e78b98216ae53d3981a121ed05b9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 29 Oct 2019 01:26:02 +0000
 Subject: [PATCH] RFC: media: hantro: Fix H264 decoding of field encoded
@@ -438,7 +438,7 @@ index 219283a06f52..7e35140a4f22 100644
  
  /**
 
-From 425502e84ccd26c89822213750e4054c480a96db Mon Sep 17 00:00:00 2001
+From 12de17b99d7e2389381657ad6f5328c95c6aad10 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Wed, 19 Aug 2020 21:12:54 +0200
 Subject: [PATCH] arm64: dts: rockchip: add rkvdec node for RK3328
@@ -512,7 +512,7 @@ index 9358d302f5e4..b54ff9055e5f 100644
  
  	vop: vop@ff370000 {
 
-From 9a067bb4800e4a9907c070dcfe68da5d625b8c8a Mon Sep 17 00:00:00 2001
+From 6e4661c70aef5e7d9a30e0bf0aa5cfa233fb94a1 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Wed, 14 Oct 2020 13:27:12 +0200
 Subject: [PATCH] media: hantro: adapt to match 5.11 H.264 uapi changes
@@ -540,7 +540,7 @@ index bc2af450a94c..7bdefcc2fc77 100644
  
  			if (dpb[i / 2].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM)
 
-From fae421aabc3a070aef53715808976d84b9a563e5 Mon Sep 17 00:00:00 2001
+From 0c62ee6f28b97e6c9265761bb2c88cc544ec65f2 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Wed, 14 Oct 2020 13:42:01 +0200
 Subject: [PATCH] media: rkvdec: adapt to match 5.11 H.264 uapi changes
@@ -586,7 +586,7 @@ index d4f27ef7addd..627cd4efabef 100644
  					set_ps_field(hw_rps, DPB_INFO(i, j),
  					             idx | (1 << 4));
 
-From e86afb0d646bd4823849138ac1708a456fff3fcb Mon Sep 17 00:00:00 2001
+From 8414ee78e57232ef2cbd169e1db6e30999801564 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sun, 31 May 2020 18:22:01 +0200
 Subject: [PATCH] media: hantro: rk3288: increase max ACLK
@@ -611,7 +611,8 @@ index 7b299ee3e93d..23f793e73941 100644
  
  /*
   * Supported formats.
-From aa00e71228f42708062cf4003cd51ee40dc32b8b Mon Sep 17 00:00:00 2001
+
+From 739eb1964e8ca26371588e231c18efe842f08a3e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 11:42:23 +0000
 Subject: [PATCH] HACK: media: rkvdec: soft reset
@@ -623,10 +624,10 @@ NOTE: rkvdec does not fully self reset, trigger pm runtime suspend to unlock whe
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 5eec0ed710b2..3108d06ef7e0 100644
+index 8c2ff05e01f7..6bc766f88c13 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.c
 +++ b/drivers/staging/media/rkvdec/rkvdec.c
-@@ -882,6 +882,8 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
+@@ -725,6 +725,8 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
  
  	pm_runtime_mark_last_busy(rkvdec->dev);
  	pm_runtime_put_autosuspend(rkvdec->dev);
@@ -635,7 +636,7 @@ index 5eec0ed710b2..3108d06ef7e0 100644
  	rkvdec_job_finish_no_pm(ctx, result);
  }
  
-@@ -920,6 +922,11 @@ static void rkvdec_device_run(void *priv)
+@@ -763,6 +765,11 @@ static void rkvdec_device_run(void *priv)
  	if (WARN_ON(!desc))
  		return;
  
@@ -647,7 +648,7 @@ index 5eec0ed710b2..3108d06ef7e0 100644
  	ret = pm_runtime_get_sync(rkvdec->dev);
  	if (ret < 0) {
  		rkvdec_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR);
-@@ -1203,7 +1210,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
+@@ -1046,7 +1053,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
  	ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
  	if (ctx) {
  		dev_err(rkvdec->dev, "Frame processing timed out!\n");
@@ -657,10 +658,10 @@ index 5eec0ed710b2..3108d06ef7e0 100644
  		writel(0, rkvdec->regs + RKVDEC_REG_SYSCTRL);
  		rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR);
 diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h
-index d5600c6a4c17..a801668f5f7b 100644
+index e95c52e3168a..2e42833d83e1 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.h
 +++ b/drivers/staging/media/rkvdec/rkvdec.h
-@@ -95,6 +95,7 @@ struct rkvdec_dev {
+@@ -91,6 +91,7 @@ struct rkvdec_dev {
  	void __iomem *regs;
  	struct mutex vdev_lock; /* serializes ioctls */
  	struct delayed_work watchdog_work;

projects/Rockchip/patches/linux/default/linux-1003-RK3328-enable-USB3-for-supported-boards.patch

@@ -1,4 +1,4 @@
-From 3fd56f9d0e8ec407bdce20b6b4af7ee3c5e17f6a Mon Sep 17 00:00:00 2001
+From e7cc7e8e0812ce96035ad1d286d79a37f3ea81d2 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sat, 16 Jan 2021 12:24:58 +0000
 Subject: [PATCH] ARM64: dts: rockchip: RK3328: enable USB3 for supported

projects/Rockchip/patches/linux/default/linux-2000-v4l-wip-rkvdec-vp9.patch

@@ -1,4 +1,4 @@
-From 829dd9c66a1664438878402cedc301d547e061fc Mon Sep 17 00:00:00 2001
+From 5794039718ae101401655afcc8485fc15102389b Mon Sep 17 00:00:00 2001
 From: Ezequiel Garcia <ezequiel@collabora.com>
 Date: Mon, 2 Nov 2020 21:05:49 +0200
 Subject: [PATCH] media: rkvdec: Fix .buf_prepare
@@ -15,7 +15,7 @@ Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 8c2ff05e01f7..86975cd4ebd0 100644
+index 6bc766f88c13..8671dcea9884 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.c
 +++ b/drivers/staging/media/rkvdec/rkvdec.c
 @@ -543,7 +543,15 @@ static int rkvdec_buf_prepare(struct vb2_buffer *vb)
@@ -36,7 +36,7 @@ index 8c2ff05e01f7..86975cd4ebd0 100644
  }
  
 
-From c7e78a632fbf3da6b677114c46943211ccb77956 Mon Sep 17 00:00:00 2001
+From e7d4c7c3de568d19163f93375c93922cc571140f Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Mon, 2 Nov 2020 21:05:50 +0200
 Subject: [PATCH] media: uapi: Add VP9 stateless decoder controls
@@ -1449,7 +1449,7 @@ index 000000000000..a14fffb3ad61
 +
 +#endif /* _VP9_CTRLS_H_ */
 
-From 437e8def48f568de70ab2514d51e6f05cd52776b Mon Sep 17 00:00:00 2001
+From 155a82eef983c13e5bc9fcb6068e4d91d1aea16c Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Mon, 2 Nov 2020 21:05:51 +0200
 Subject: [PATCH] media: rkvdec: Add the VP9 backend
@@ -3061,7 +3061,7 @@ index 000000000000..8b443ed511c9
 +	.done = rkvdec_vp9_done,
 +};
 diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 86975cd4ebd0..e1eec79fe9a2 100644
+index 8671dcea9884..073a7b0fd7b0 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.c
 +++ b/drivers/staging/media/rkvdec/rkvdec.c
 @@ -159,6 +159,40 @@ static const u32 rkvdec_h264_decoded_fmts[] = {
@@ -3153,7 +3153,7 @@ index 86975cd4ebd0..e1eec79fe9a2 100644
  	if (ret)
  		return ret;
 diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h
-index e95c52e3168a..5f66f07acac5 100644
+index 2e42833d83e1..68d268f37c86 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.h
 +++ b/drivers/staging/media/rkvdec/rkvdec.h
 @@ -51,6 +51,10 @@ struct rkvdec_vp9_decoded_buffer_info {
@@ -3167,7 +3167,7 @@ index e95c52e3168a..5f66f07acac5 100644
  };
  
  static inline struct rkvdec_decoded_buffer *
-@@ -119,4 +123,6 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
+@@ -120,4 +124,6 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
  void rkvdec_run_postamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
  
  extern const struct rkvdec_coded_fmt_ops rkvdec_h264_fmt_ops;

projects/Rockchip/patches/linux/default/linux-2001-v4l-wip-rkvdec-hevc.patch

@@ -1,4 +1,4 @@
-From 675a97781f4a43807d29473f27ed7888bca0e3e5 Mon Sep 17 00:00:00 2001
+From 669adf695f98a9566741ab25f59c24ed619a456e Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 26 Oct 2019 13:55:15 +0200
 Subject: [PATCH] media: uapi: hevc: Add scaling matrix control
@@ -154,7 +154,7 @@ index 1009cf0891cc..1592e52c3614 100644
 +
  #endif
 
-From 3d1d4437c6cd686a171b1f0ba11e35e07328b70b Mon Sep 17 00:00:00 2001
+From 440e3efbf4c5340a7e69329fb75f40756a800a48 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 26 Oct 2019 15:42:28 +0200
 Subject: [PATCH] media: uapi: hevc: Add segment address field
@@ -217,7 +217,7 @@ index 1592e52c3614..3e2e32098312 100644
  	/* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */
  	struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 
-From 076ec99168f4ac51ad84f162521c162037b24387 Mon Sep 17 00:00:00 2001
+From 858acf136fbac4923e04d8faeb0e18d8fcb446c0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 15:03:46 +0000
 Subject: [PATCH] WIP: media: uapi: hevc: add fields needed for rkvdec
@@ -287,7 +287,7 @@ index 3e2e32098312..3cc3b47e1417 100644
  	/* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */
  	struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 
-From d324ae4d5f4a68008b6f599225143dc83d24bfad Mon Sep 17 00:00:00 2001
+From 2442d3b1ae900e75f19cbfcdc506e3dd06f12042 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 15:07:15 +0000
 Subject: [PATCH] HACK: media: uapi: hevc: tiles and num_slices
@@ -330,7 +330,7 @@ index 3cc3b47e1417..b33e1a8141e1 100644
  	/* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */
  	struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
 
-From 00f54f3488e9b9aef05c5555198d27eacc273da4 Mon Sep 17 00:00:00 2001
+From e7453ce1b822f9abc7b29460edd6d6b0a01d1eac Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 15:17:45 +0000
 Subject: [PATCH] WIP: media: rkvdec: add HEVC backend
@@ -2898,7 +2898,7 @@ index 15b9bee92016..83bf790ed9b7 100644
  #define RKVDEC_MODE_VP9					2
  #define RKVDEC_RPS_MODE					BIT(24)
 diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index e1eec79fe9a2..880a70c9291e 100644
+index 073a7b0fd7b0..315894fc511b 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.c
 +++ b/drivers/staging/media/rkvdec/rkvdec.c
 @@ -159,6 +159,61 @@ static const u32 rkvdec_h264_decoded_fmts[] = {
@@ -2986,10 +2986,10 @@ index e1eec79fe9a2..880a70c9291e 100644
  		.fourcc = V4L2_PIX_FMT_VP9_FRAME,
  		.frmsize = {
 diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h
-index 5f66f07acac5..d5600c6a4c17 100644
+index 68d268f37c86..a801668f5f7b 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.h
 +++ b/drivers/staging/media/rkvdec/rkvdec.h
-@@ -123,6 +123,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
+@@ -124,6 +124,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
  void rkvdec_run_postamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run);
  
  extern const struct rkvdec_coded_fmt_ops rkvdec_h264_fmt_ops;
@@ -2998,7 +2998,7 @@ index 5f66f07acac5..d5600c6a4c17 100644
  
  #endif /* RKVDEC_H_ */
 
-From de25bd06e32aeea9644cce18620a56a1aea02655 Mon Sep 17 00:00:00 2001
+From c4d8468621327805f65b028779e035c35a65613c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 1 Aug 2020 12:24:58 +0000
 Subject: [PATCH] WIP: media: rkvdec: add HEVC format validation
@@ -3038,7 +3038,7 @@ index 03ba848411c6..b8ad7fc2271c 100644
  	.stop = rkvdec_hevc_stop,
  	.run = rkvdec_hevc_run,
 diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 880a70c9291e..5eec0ed710b2 100644
+index 315894fc511b..3108d06ef7e0 100644
 --- a/drivers/staging/media/rkvdec/rkvdec.c
 +++ b/drivers/staging/media/rkvdec/rkvdec.c
 @@ -76,6 +76,26 @@ static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl)