From: Greg Kroah-Hartman Date: Wed, 15 Jul 2020 09:24:36 +0000 (+0200) Subject: drop drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch from everywhere. X-Git-Tag: v5.7.9~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4aed9e560b9912e04df2073cbb377d03c30bd956;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch from everywhere. --- diff --git a/queue-4.19/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch b/queue-4.19/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch deleted file mode 100644 index 8aca2658413..00000000000 --- a/queue-4.19/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f4b463d04e8b5c2992a5282e37e91d6cb137ba5b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 May 2020 16:07:24 +0200 -Subject: drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU - -From: Maxime Ripard - -[ Upstream commit 842ec61f4006a6477a9deaedd69131e9f46e4cb5 ] - -The main DRM device is actually a virtual device so it doesn't have the -iommus property, which is instead on the DMA masters, in this case the -mixers. - -Add a call to of_dma_configure with the mixers DT node but on the DRM -virtual device to configure it in the same way than the mixers. - -Reviewed-by: Paul Kocialkowski -Signed-off-by: Maxime Ripard -Link: https://patchwork.freedesktop.org/patch/msgid/9a4daf438dd3f2fe07afb23688bfb793a0613d7d.1589378833.git-series.maxime@cerno.tech -(cherry picked from commit b718102dbdfd0285ad559687a30e27cc9124e592) -[Maxime: Applied to -fixes since it missed the merge window and display is - broken without it] -Signed-off-by: Maxime Ripard -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index 71a798e5d5591..ddab3fab36a1a 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_mixer.c -+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c -@@ -435,6 +435,19 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, - mixer->engine.ops = &sun8i_engine_ops; - mixer->engine.node = dev->of_node; - -+ if (of_find_property(dev->of_node, "iommus", NULL)) { -+ /* -+ * This assume we have the same DMA constraints for -+ * all our the mixers in our pipeline. This sounds -+ * bad, but it has always been the case for us, and -+ * DRM doesn't do per-device allocation either, so we -+ * would need to fix DRM first... -+ */ -+ ret = of_dma_configure(drm->dev, dev->of_node, true); -+ if (ret) -+ return ret; -+ } -+ - /* - * While this function can fail, we shouldn't do anything - * if this happens. Some early DE2 DT entries don't provide --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 1011d027980..d63f2aa9b51 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -14,7 +14,6 @@ i40e-protect-ring-accesses-with-read-and-write_once.patch drm-panel-orientation-quirks-add-quirk-for-asus-t101.patch drm-panel-orientation-quirks-use-generic-orientation.patch s390-kasan-fix-early-pgm-check-handler-execution.patch -drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch cifs-update-ctime-and-mtime-during-truncate.patch arm-imx6-add-missing-put_device-call-in-imx6q_suspen.patch scsi-mptscsih-fix-read-sense-data-size.patch diff --git a/queue-5.4/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch b/queue-5.4/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch deleted file mode 100644 index 99ee7a1cfad..00000000000 --- a/queue-5.4/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 99e19a0f06e53027b4b9fb998cf557627c8c62af Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 May 2020 16:07:24 +0200 -Subject: drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU - -From: Maxime Ripard - -[ Upstream commit 842ec61f4006a6477a9deaedd69131e9f46e4cb5 ] - -The main DRM device is actually a virtual device so it doesn't have the -iommus property, which is instead on the DMA masters, in this case the -mixers. - -Add a call to of_dma_configure with the mixers DT node but on the DRM -virtual device to configure it in the same way than the mixers. - -Reviewed-by: Paul Kocialkowski -Signed-off-by: Maxime Ripard -Link: https://patchwork.freedesktop.org/patch/msgid/9a4daf438dd3f2fe07afb23688bfb793a0613d7d.1589378833.git-series.maxime@cerno.tech -(cherry picked from commit b718102dbdfd0285ad559687a30e27cc9124e592) -[Maxime: Applied to -fixes since it missed the merge window and display is - broken without it] -Signed-off-by: Maxime Ripard -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index 18b4881f44814..e24f225d80f1f 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_mixer.c -+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c -@@ -452,6 +452,19 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, - mixer->engine.ops = &sun8i_engine_ops; - mixer->engine.node = dev->of_node; - -+ if (of_find_property(dev->of_node, "iommus", NULL)) { -+ /* -+ * This assume we have the same DMA constraints for -+ * all our the mixers in our pipeline. This sounds -+ * bad, but it has always been the case for us, and -+ * DRM doesn't do per-device allocation either, so we -+ * would need to fix DRM first... -+ */ -+ ret = of_dma_configure(drm->dev, dev->of_node, true); -+ if (ret) -+ return ret; -+ } -+ - /* - * While this function can fail, we shouldn't do anything - * if this happens. Some early DE2 DT entries don't provide --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index eaec7c692ed..b3f011fc480 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -23,7 +23,6 @@ iommu-vt-d-don-t-apply-gfx-quirks-to-untrusted-devic.patch drm-panel-orientation-quirks-add-quirk-for-asus-t101.patch drm-panel-orientation-quirks-use-generic-orientation.patch s390-kasan-fix-early-pgm-check-handler-execution.patch -drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch cifs-update-ctime-and-mtime-during-truncate.patch arm-imx6-add-missing-put_device-call-in-imx6q_suspen.patch scsi-mptscsih-fix-read-sense-data-size.patch diff --git a/queue-5.7/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch b/queue-5.7/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch deleted file mode 100644 index e3f8bc1df98..00000000000 --- a/queue-5.7/drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 82a87aa81e6d34b1ad892f827cd937b04a2944ea Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 13 May 2020 16:07:24 +0200 -Subject: drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU - -From: Maxime Ripard - -[ Upstream commit 842ec61f4006a6477a9deaedd69131e9f46e4cb5 ] - -The main DRM device is actually a virtual device so it doesn't have the -iommus property, which is instead on the DMA masters, in this case the -mixers. - -Add a call to of_dma_configure with the mixers DT node but on the DRM -virtual device to configure it in the same way than the mixers. - -Reviewed-by: Paul Kocialkowski -Signed-off-by: Maxime Ripard -Link: https://patchwork.freedesktop.org/patch/msgid/9a4daf438dd3f2fe07afb23688bfb793a0613d7d.1589378833.git-series.maxime@cerno.tech -(cherry picked from commit b718102dbdfd0285ad559687a30e27cc9124e592) -[Maxime: Applied to -fixes since it missed the merge window and display is - broken without it] -Signed-off-by: Maxime Ripard -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index 4a64f7ae437a8..19b3b41847046 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_mixer.c -+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c -@@ -452,6 +452,19 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, - mixer->engine.ops = &sun8i_engine_ops; - mixer->engine.node = dev->of_node; - -+ if (of_find_property(dev->of_node, "iommus", NULL)) { -+ /* -+ * This assume we have the same DMA constraints for -+ * all our the mixers in our pipeline. This sounds -+ * bad, but it has always been the case for us, and -+ * DRM doesn't do per-device allocation either, so we -+ * would need to fix DRM first... -+ */ -+ ret = of_dma_configure(drm->dev, dev->of_node, true); -+ if (ret) -+ return ret; -+ } -+ - /* - * While this function can fail, we shouldn't do anything - * if this happens. Some early DE2 DT entries don't provide --- -2.25.1 - diff --git a/queue-5.7/series b/queue-5.7/series index 4d46179e817..4901042ea30 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -29,7 +29,6 @@ iommu-vt-d-don-t-apply-gfx-quirks-to-untrusted-devic.patch drm-panel-orientation-quirks-add-quirk-for-asus-t101.patch drm-panel-orientation-quirks-use-generic-orientation.patch s390-kasan-fix-early-pgm-check-handler-execution.patch -drm-sun4i-mixer-call-of_dma_configure-if-there-s-an-.patch cifs-update-ctime-and-mtime-during-truncate.patch arm-imx6-add-missing-put_device-call-in-imx6q_suspen.patch scsi-qla2xxx-fix-mpi-failure-aen-8200-handling.patch