From a10804f84d37a33396cdcc16a3dcba2b0dba5c61 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 15 Feb 2023 15:57:34 +0800 Subject: [PATCH] rockchip: backport a fix for DRM register names Signed-off-by: Tianling Shen --- ...-Change-register-space-names-in-vop2.patch | 36 +++++++++++++++++++ ...chip-dwc-Reset-core-at-driver-probe.patch} | 0 ...ip-dwc-Add-legacy-interrupt-support.patch} | 0 ...ckchip-vop2-unlock-on-error-path-in.patch} | 0 ...ntro-Add-support-for-RK356x-encoder.patch} | 0 ...o-usb2-Ignore-OTG-IRQs-in-host-mode.patch} | 0 ...Fix-RK3399-H.264-format-advertising.patch} | 0 ...b2-Prevent-incorrect-error-on-probe.patch} | 0 ...ip-inno-usb2-Sync-initial-otg-state.patch} | 0 ...4-v6.1-phy-rockchip-Support-PCIe-v3.patch} | 0 ...nno-usb2-Return-zero-after-otg-sync.patch} | 0 11 files changed, 36 insertions(+) create mode 100644 target/linux/rockchip/patches-5.15/008-0035-v5.19-drm-rockchip-Change-register-space-names-in-vop2.patch rename target/linux/rockchip/patches-5.15/{008-0035-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch => 008-0036-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0036-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch => 008-0037-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0037-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch => 008-0038-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0038-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch => 008-0039-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0039-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch => 008-0040-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0040-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch => 008-0041-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0041-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch => 008-0042-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0042-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch => 008-0043-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0043-v6.1-phy-rockchip-Support-PCIe-v3.patch => 008-0044-v6.1-phy-rockchip-Support-PCIe-v3.patch} (100%) rename target/linux/rockchip/patches-5.15/{008-0044-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch => 008-0045-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch} (100%) diff --git a/target/linux/rockchip/patches-5.15/008-0035-v5.19-drm-rockchip-Change-register-space-names-in-vop2.patch b/target/linux/rockchip/patches-5.15/008-0035-v5.19-drm-rockchip-Change-register-space-names-in-vop2.patch new file mode 100644 index 0000000000..9bed6cabfa --- /dev/null +++ b/target/linux/rockchip/patches-5.15/008-0035-v5.19-drm-rockchip-Change-register-space-names-in-vop2.patch @@ -0,0 +1,36 @@ +From 5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 11 May 2022 10:21:08 +0200 +Subject: [PATCH] drm/rockchip: Change register space names in vop2 + +"regs" seems to generic when there are multiple register spaces, so +rename that one to "vop". Also change "gamma_lut" to better looking +"gamma-lut". + +Signed-off-by: Sascha Hauer +Signed-off-by: Heiko Stuebner +Link: https://patchwork.freedesktop.org/patch/msgid/20220511082109.1110043-3-s.hauer@pengutronix.de +--- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c ++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +@@ -2620,7 +2620,7 @@ static int vop2_bind(struct device *dev, + + dev_set_drvdata(dev, vop2); + +- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vop"); + if (!res) { + drm_err(vop2->drm, "failed to get vop2 register byname\n"); + return -EINVAL; +@@ -2637,7 +2637,7 @@ static int vop2_bind(struct device *dev, + if (ret) + return ret; + +- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma_lut"); ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma-lut"); + if (res) { + vop2->lut_regs = devm_ioremap_resource(dev, res); + if (IS_ERR(vop2->lut_regs)) diff --git a/target/linux/rockchip/patches-5.15/008-0035-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch b/target/linux/rockchip/patches-5.15/008-0036-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0035-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch rename to target/linux/rockchip/patches-5.15/008-0036-v5.19-PCI-rockchip-dwc-Reset-core-at-driver-probe.patch diff --git a/target/linux/rockchip/patches-5.15/008-0036-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch b/target/linux/rockchip/patches-5.15/008-0037-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0036-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch rename to target/linux/rockchip/patches-5.15/008-0037-v5.19-PCI-rockchip-dwc-Add-legacy-interrupt-support.patch diff --git a/target/linux/rockchip/patches-5.15/008-0037-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch b/target/linux/rockchip/patches-5.15/008-0038-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0037-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch rename to target/linux/rockchip/patches-5.15/008-0038-v6.0-drm-rockchip-vop2-unlock-on-error-path-in.patch diff --git a/target/linux/rockchip/patches-5.15/008-0038-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch b/target/linux/rockchip/patches-5.15/008-0039-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0038-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch rename to target/linux/rockchip/patches-5.15/008-0039-v6.0-media-hantro-Add-support-for-RK356x-encoder.patch diff --git a/target/linux/rockchip/patches-5.15/008-0039-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch b/target/linux/rockchip/patches-5.15/008-0040-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0039-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch rename to target/linux/rockchip/patches-5.15/008-0040-v6.0-phy-rockchip-inno-usb2-Ignore-OTG-IRQs-in-host-mode.patch diff --git a/target/linux/rockchip/patches-5.15/008-0040-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch b/target/linux/rockchip/patches-5.15/008-0041-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0040-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch rename to target/linux/rockchip/patches-5.15/008-0041-v6.0-media-hantro-Fix-RK3399-H.264-format-advertising.patch diff --git a/target/linux/rockchip/patches-5.15/008-0041-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch b/target/linux/rockchip/patches-5.15/008-0042-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0041-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch rename to target/linux/rockchip/patches-5.15/008-0042-v6.0-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-probe.patch diff --git a/target/linux/rockchip/patches-5.15/008-0042-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch b/target/linux/rockchip/patches-5.15/008-0043-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0042-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch rename to target/linux/rockchip/patches-5.15/008-0043-v6.0-phy-rockchip-inno-usb2-Sync-initial-otg-state.patch diff --git a/target/linux/rockchip/patches-5.15/008-0043-v6.1-phy-rockchip-Support-PCIe-v3.patch b/target/linux/rockchip/patches-5.15/008-0044-v6.1-phy-rockchip-Support-PCIe-v3.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0043-v6.1-phy-rockchip-Support-PCIe-v3.patch rename to target/linux/rockchip/patches-5.15/008-0044-v6.1-phy-rockchip-Support-PCIe-v3.patch diff --git a/target/linux/rockchip/patches-5.15/008-0044-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch b/target/linux/rockchip/patches-5.15/008-0045-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/008-0044-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch rename to target/linux/rockchip/patches-5.15/008-0045-v6.1-phy-rockchip-inno-usb2-Return-zero-after-otg-sync.patch