From: Greg Kroah-Hartman Date: Sat, 8 Jun 2019 09:30:15 +0000 (+0200) Subject: drop drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch from 4.4.y and 4.9.y X-Git-Tag: v5.1.8~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e487490accb215505fb168f874b7c0289db4df52;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch from 4.4.y and 4.9.y --- diff --git a/queue-4.4/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch b/queue-4.4/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch deleted file mode 100644 index a911e80c38b..00000000000 --- a/queue-4.4/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b8f9d7f37b6af829c34c49d1a4f73ce6ed58e403 Mon Sep 17 00:00:00 2001 -From: Vicente Bergas -Date: Tue, 2 Apr 2019 13:37:53 +0200 -Subject: drm/rockchip: shutdown drm subsystem on shutdown - -From: Vicente Bergas - -commit b8f9d7f37b6af829c34c49d1a4f73ce6ed58e403 upstream. - -As explained by Robin Murphy: -> the IOMMU shutdown disables paging, so if the VOP is still -> scanning out then that will result in whatever IOVAs it was using now going -> straight out onto the bus as physical addresses. - -We had a more radical approach before in commit -7f3ef5dedb14 ("drm/rockchip: Allow driver to be shutdown on reboot/kexec") -but that resulted in new warnings and oopses on shutdown on rk3399 -chromeos devices. - -So second try is resurrecting Vicentes shutdown change which should -achieve the same result but in a less drastic way. - -Fixes: 63238173b2fa ("Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec"") -Cc: Jeffy Chen -Cc: Robin Murphy -Cc: Marc Zyngier -Cc: Brian Norris -Cc: Doug Anderson -Cc: stable@vger.kernel.org -Suggested-by: JeffyChen -Suggested-by: Robin Murphy -Signed-off-by: Vicente Bergas -[adapted commit message to explain the history] -Signed-off-by: Heiko Stuebner -Tested-by: Brian Norris -Tested-by: Douglas Anderson -Acked-by: Marc Zyngier -Link: https://patchwork.freedesktop.org/patch/msgid/20190402113753.10118-1-heiko@sntech.de -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -547,6 +547,14 @@ static int rockchip_drm_platform_remove( - return 0; - } - -+static void rockchip_drm_platform_shutdown(struct platform_device *pdev) -+{ -+ struct drm_device *drm = platform_get_drvdata(pdev); -+ -+ if (drm) -+ drm_atomic_helper_shutdown(drm); -+} -+ - static const struct of_device_id rockchip_drm_dt_ids[] = { - { .compatible = "rockchip,display-subsystem", }, - { /* sentinel */ }, -@@ -556,6 +564,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ - static struct platform_driver rockchip_drm_platform_driver = { - .probe = rockchip_drm_platform_probe, - .remove = rockchip_drm_platform_remove, -+ .shutdown = rockchip_drm_platform_shutdown, - .driver = { - .name = "rockchip-drm", - .of_match_table = rockchip_drm_dt_ids, diff --git a/queue-4.4/series b/queue-4.4/series index 2cc86afa24c..1b644954d3e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -211,7 +211,6 @@ tty-max310x-fix-external-crystal-register-setup.patch memcg-make-it-work-on-sparse-non-0-node-systems.patch kernel-signal.c-trace_signal_deliver-when-signal_group_exit.patch cifs-cifs_read_allocate_pages-don-t-iterate-through-whole-page-array-on-enomem.patch -drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch binder-replace-p-with-pk-for-stable.patch binder-replace-p-with-pk.patch net-create-skb_gso_validate_mac_len.patch diff --git a/queue-4.9/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch b/queue-4.9/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch deleted file mode 100644 index c355b44c537..00000000000 --- a/queue-4.9/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b8f9d7f37b6af829c34c49d1a4f73ce6ed58e403 Mon Sep 17 00:00:00 2001 -From: Vicente Bergas -Date: Tue, 2 Apr 2019 13:37:53 +0200 -Subject: drm/rockchip: shutdown drm subsystem on shutdown - -From: Vicente Bergas - -commit b8f9d7f37b6af829c34c49d1a4f73ce6ed58e403 upstream. - -As explained by Robin Murphy: -> the IOMMU shutdown disables paging, so if the VOP is still -> scanning out then that will result in whatever IOVAs it was using now going -> straight out onto the bus as physical addresses. - -We had a more radical approach before in commit -7f3ef5dedb14 ("drm/rockchip: Allow driver to be shutdown on reboot/kexec") -but that resulted in new warnings and oopses on shutdown on rk3399 -chromeos devices. - -So second try is resurrecting Vicentes shutdown change which should -achieve the same result but in a less drastic way. - -Fixes: 63238173b2fa ("Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec"") -Cc: Jeffy Chen -Cc: Robin Murphy -Cc: Marc Zyngier -Cc: Brian Norris -Cc: Doug Anderson -Cc: stable@vger.kernel.org -Suggested-by: JeffyChen -Suggested-by: Robin Murphy -Signed-off-by: Vicente Bergas -[adapted commit message to explain the history] -Signed-off-by: Heiko Stuebner -Tested-by: Brian Norris -Tested-by: Douglas Anderson -Acked-by: Marc Zyngier -Link: https://patchwork.freedesktop.org/patch/msgid/20190402113753.10118-1-heiko@sntech.de -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -478,6 +478,14 @@ static int rockchip_drm_platform_remove( - return 0; - } - -+static void rockchip_drm_platform_shutdown(struct platform_device *pdev) -+{ -+ struct drm_device *drm = platform_get_drvdata(pdev); -+ -+ if (drm) -+ drm_atomic_helper_shutdown(drm); -+} -+ - static const struct of_device_id rockchip_drm_dt_ids[] = { - { .compatible = "rockchip,display-subsystem", }, - { /* sentinel */ }, -@@ -487,6 +495,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ - static struct platform_driver rockchip_drm_platform_driver = { - .probe = rockchip_drm_platform_probe, - .remove = rockchip_drm_platform_remove, -+ .shutdown = rockchip_drm_platform_shutdown, - .driver = { - .name = "rockchip-drm", - .of_match_table = rockchip_drm_dt_ids, diff --git a/queue-4.9/series b/queue-4.9/series index 5ed21ac73db..f407955e624 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -46,7 +46,6 @@ staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch cifs-cifs_read_allocate_pages-don-t-iterate-through-whole-page-array-on-enomem.patch gcc-plugins-fix-build-failures-under-darwin-host.patch drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch -drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch brcmfmac-add-length-checks-in-scheduled-scan-result-handler.patch brcmfmac-assure-ssid-length-from-firmware-is-limited.patch brcmfmac-add-subtype-check-for-event-handling-in-data-path.patch