From 957af85a655e3bdfc8c72c2065ad1c6f2a17abdf Mon Sep 17 00:00:00 2001 From: Werner Date: Mon, 30 Dec 2024 09:05:53 +0100 Subject: [PATCH] Remove upstreamed patch https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/diff/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c?id=v6.13-rc5&id2=v6.13-rc4 --- .../rk3588-0130-add-hdmi1-support.patch | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch b/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch index bfb8cfe6d25c..fac3bd586576 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch +++ b/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch @@ -1,48 +1,3 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cristian Ciocaltea -Date: Wed, 23 Oct 2024 20:29:54 +0300 -Subject: phy: rockchip: samsung-hdptx: Set drvdata before enabling runtime PM - -In some cases, rk_hdptx_phy_runtime_resume() may be invoked before -platform_set_drvdata() is executed in ->probe(), leading to a NULL -pointer dereference when using the return of dev_get_drvdata(). - -Ensure platform_set_drvdata() is called before devm_pm_runtime_enable(). - -Reported-by: Dmitry Osipenko -Fixes: 553be2830c5f ("phy: rockchip: Add Samsung HDMI/eDP Combo PHY driver") -Signed-off-by: Cristian Ciocaltea -Reviewed-by: Heiko Stuebner -Link: https://lore.kernel.org/r/20241023-phy-sam-hdptx-rpm-fix-v1-1-87f4c994e346@collabora.com -Signed-off-by: Vinod Koul ---- - drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 111111111111..222222222222 100644 ---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -@@ -1101,6 +1101,8 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) - return dev_err_probe(dev, PTR_ERR(hdptx->grf), - "Could not get GRF syscon\n"); - -+ platform_set_drvdata(pdev, hdptx); -+ - ret = devm_pm_runtime_enable(dev); - if (ret) - return dev_err_probe(dev, ret, "Failed to enable runtime PM\n"); -@@ -1110,7 +1112,6 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) - return dev_err_probe(dev, PTR_ERR(hdptx->phy), - "Failed to create HDMI PHY\n"); - -- platform_set_drvdata(pdev, hdptx); - phy_set_drvdata(hdptx->phy, hdptx); - phy_set_bus_width(hdptx->phy, 8); - --- -Armbian - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 6 Dec 2024 11:34:01 +0100