From cdb415765883985044f1a018f880df25e1ce889e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Jun 2019 14:42:56 +0200 Subject: [PATCH] 4.9-stable patches added patches: drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch --- ...p-shutdown-drm-subsystem-on-shutdown.patch | 69 +++++++++++++++++++ ...hotplug-events-on-initial-master-set.patch | 40 +++++++++++ queue-4.9/series | 2 + 3 files changed, 111 insertions(+) create mode 100644 queue-4.9/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch create mode 100644 queue-4.9/drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.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 new file mode 100644 index 00000000000..c355b44c537 --- /dev/null +++ b/queue-4.9/drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch @@ -0,0 +1,69 @@ +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/drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch b/queue-4.9/drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch new file mode 100644 index 00000000000..2d9038eea06 --- /dev/null +++ b/queue-4.9/drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch @@ -0,0 +1,40 @@ +From 63cb44441826e842b7285575b96db631cc9f2505 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom +Date: Tue, 7 May 2019 11:07:53 +0200 +Subject: drm/vmwgfx: Don't send drm sysfs hotplug events on initial master set + +From: Thomas Hellstrom + +commit 63cb44441826e842b7285575b96db631cc9f2505 upstream. + +This may confuse user-space clients like plymouth that opens a drm +file descriptor as a result of a hotplug event and then generates a +new event... + +Cc: +Fixes: 5ea1734827bb ("drm/vmwgfx: Send a hotplug event at master_set") +Signed-off-by: Thomas Hellstrom +Reviewed-by: Deepak Rawat +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +@@ -1245,7 +1245,13 @@ static int vmw_master_set(struct drm_dev + } + + dev_priv->active_master = vmaster; +- drm_sysfs_hotplug_event(dev); ++ ++ /* ++ * Inform a new master that the layout may have changed while ++ * it was gone. ++ */ ++ if (!from_open) ++ drm_sysfs_hotplug_event(dev); + + return 0; + } diff --git a/queue-4.9/series b/queue-4.9/series index fd2ac9de58e..b30551eed28 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -45,3 +45,5 @@ docs-fix-conf.py-for-sphinx-2.0.patch 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 -- 2.47.2