From 89a8bd7aa86753c9bbdff29196be91aa560c6cbd Mon Sep 17 00:00:00 2001 From: sbwml Date: Mon, 2 Sep 2024 03:38:50 +0800 Subject: [PATCH] rockchip: patches-6.6: refresh patches * linux-6.6.48 Signed-off-by: sbwml --- ...2-rk356x-add-dwc3-xhci-usb-trb-quirk.patch | 2 +- ...ockchip-remove-unused-struct-in-vop2.patch | 2 +- ...kchip-remove-NR_LAYERS-macro-on-vop2.patch | 4 +-- ...-clear-afbc-en-and-transform-bit-for.patch | 36 ------------------- ...TL8211-add-LED-configuration-from-OF.patch | 4 +-- ...gic-v3-add-hackaround-for-rk3568-its.patch | 10 +++--- 6 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 patches-6.6/033-22-v6.8-drm-rockchip-vop2-clear-afbc-en-and-transform-bit-for.patch diff --git a/patches-6.6/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch b/patches-6.6/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch index a11c727..e12b67c 100644 --- a/patches-6.6/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch +++ b/patches-6.6/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch @@ -18,7 +18,7 @@ --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1578,6 +1578,8 @@ static void dwc3_get_properties(struct d +@@ -1591,6 +1591,8 @@ static void dwc3_get_properties(struct d "snps,dis-del-phy-power-chg-quirk"); dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev, "snps,dis-tx-ipgap-linecheck-quirk"); diff --git a/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch b/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch index d38f249..a1611a1 100644 --- a/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch +++ b/patches-6.6/033-07-v6.7-drm-rockchip-remove-unused-struct-in-vop2.patch @@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122036.1594090-1-and const struct vop2_video_port_data *data; struct completion dsp_hold_completion; -@@ -2275,7 +2274,6 @@ static int vop2_create_crtcs(struct vop2 +@@ -2280,7 +2279,6 @@ static int vop2_create_crtcs(struct vop2 vp = &vop2->vps[i]; vp->vop2 = vop2; vp->id = vp_data->id; diff --git a/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch b/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch index b4499db..8718935 100644 --- a/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch +++ b/patches-6.6/033-08-v6.7-drm-rockchip-remove-NR_LAYERS-macro-on-vop2.patch @@ -16,7 +16,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -@@ -2252,8 +2252,6 @@ static struct vop2_video_port *find_vp_w +@@ -2257,8 +2257,6 @@ static struct vop2_video_port *find_vp_w return NULL; } @@ -25,7 +25,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-and static int vop2_create_crtcs(struct vop2 *vop2) { const struct vop2_data *vop2_data = vop2->data; -@@ -2372,7 +2370,7 @@ static int vop2_create_crtcs(struct vop2 +@@ -2377,7 +2375,7 @@ static int vop2_create_crtcs(struct vop2 struct vop2_video_port *vp = &vop2->vps[i]; if (vp->crtc.port) diff --git a/patches-6.6/033-22-v6.8-drm-rockchip-vop2-clear-afbc-en-and-transform-bit-for.patch b/patches-6.6/033-22-v6.8-drm-rockchip-vop2-clear-afbc-en-and-transform-bit-for.patch deleted file mode 100644 index f129011..0000000 --- a/patches-6.6/033-22-v6.8-drm-rockchip-vop2-clear-afbc-en-and-transform-bit-for.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 20529a68307feed00dd3d431d3fff0572616b0f2 Mon Sep 17 00:00:00 2001 -From: Andy Yan -Date: Mon, 11 Dec 2023 19:57:41 +0800 -Subject: [PATCH] drm/rockchip: vop2: clear afbc en and transform bit for - cluster window at linear mode - -The enable bit and transform offset of cluster windows should be -cleared when it work at linear mode, or we may have a iommu fault -issue on rk3588 which cluster windows switch between afbc and linear -mode. - -As the cluster windows of rk3568 only supports afbc format -so is therefore not affected. - -Signed-off-by: Andy Yan -Reviewed-by: Sascha Hauer -Signed-off-by: Heiko Stuebner -Link: https://patchwork.freedesktop.org/patch/msgid/20231211115741.1784954-1-andyshrk@163.com ---- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -@@ -1314,6 +1314,11 @@ static void vop2_plane_atomic_update(str - vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_270, rotate_270); - vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_90, rotate_90); - } else { -+ if (vop2_cluster_window(win)) { -+ vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 0); -+ vop2_win_write(win, VOP2_WIN_AFBC_TRANSFORM_OFFSET, 0); -+ } -+ - vop2_win_write(win, VOP2_WIN_YRGB_VIR, DIV_ROUND_UP(fb->pitches[0], 4)); - } - diff --git a/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch b/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch index c748fe7..b6c4cdf 100644 --- a/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch +++ b/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch @@ -18,7 +18,7 @@ Subject: [PATCH] net: phy: realtek: add LED configuration from OF for 8211f #define RTL8211F_PHYCR1 0x18 #define RTL8211F_PHYCR2 0x19 #define RTL8211F_INSR 0x1d -@@ -357,6 +359,7 @@ static int rtl8211f_config_init(struct p +@@ -376,6 +378,7 @@ static int rtl8211f_config_init(struct p struct rtl821x_priv *priv = phydev->priv; struct device *dev = &phydev->mdio.dev; u16 val_txdly, val_rxdly; @@ -26,7 +26,7 @@ Subject: [PATCH] net: phy: realtek: add LED configuration from OF for 8211f int ret; ret = phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1, -@@ -432,6 +435,15 @@ static int rtl8211f_config_init(struct p +@@ -451,6 +454,15 @@ static int rtl8211f_config_init(struct p return ret; } diff --git a/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch b/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch index cf17e26..dc62de4 100644 --- a/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch +++ b/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch @@ -138,7 +138,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -4754,6 +4791,13 @@ static bool its_set_non_coherent(void *d +@@ -4752,6 +4789,13 @@ static bool its_set_non_coherent(void *d return true; } @@ -152,7 +152,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its static const struct gic_quirk its_quirks[] = { #ifdef CONFIG_CAVIUM_ERRATUM_22375 { -@@ -4808,6 +4852,14 @@ static const struct gic_quirk its_quirks +@@ -4806,6 +4850,14 @@ static const struct gic_quirk its_quirks .init = its_enable_rk3588001, }, #endif @@ -167,7 +167,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its { .desc = "ITS: non-coherent attribute", .property = "dma-noncoherent", -@@ -5069,6 +5121,7 @@ static int __init its_probe_one(struct i +@@ -5067,6 +5119,7 @@ static int __init its_probe_one(struct i struct page *page; u32 ctlr; int err; @@ -175,7 +175,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its its_enable_quirks(its); -@@ -5102,7 +5155,9 @@ static int __init its_probe_one(struct i +@@ -5100,7 +5153,9 @@ static int __init its_probe_one(struct i } } @@ -186,7 +186,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its get_order(ITS_CMD_QUEUE_SZ)); if (!page) { err = -ENOMEM; -@@ -5128,6 +5183,9 @@ static int __init its_probe_one(struct i +@@ -5126,6 +5181,9 @@ static int __init its_probe_one(struct i gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER);