Revision 63238173b2faf3d6b85a416f1c69af6c7be2413f authored by Brian Norris on 05 December 2018, 18:16:57 UTC, committed by Heiko Stuebner on 11 December 2018, 14:15:57 UTC
This reverts commit 7f3ef5dedb146e3d5063b6845781ad1bb59b92b5. It causes new warnings [1] on shutdown when running the Google Kevin or Scarlet (RK3399) boards under Chrome OS. Presumably our usage of DRM is different than what Marc and Heiko test. We're looking at a different approach (e.g., [2]) to replace this, but IMO the revert should be taken first, as it already propagated to -stable. [1] Report here: http://lkml.kernel.org/lkml/20181205030127.GA200921@google.com WARNING: CPU: 4 PID: 2035 at drivers/gpu/drm/drm_mode_config.c:477 drm_mode_config_cleanup+0x1c4/0x294 ... Call trace: drm_mode_config_cleanup+0x1c4/0x294 rockchip_drm_unbind+0x4c/0x8c component_master_del+0x88/0xb8 rockchip_drm_platform_remove+0x2c/0x44 rockchip_drm_platform_shutdown+0x20/0x2c platform_drv_shutdown+0x2c/0x38 device_shutdown+0x164/0x1b8 kernel_restart_prepare+0x40/0x48 kernel_restart+0x20/0x68 ... Memory manager not clean during takedown. WARNING: CPU: 4 PID: 2035 at drivers/gpu/drm/drm_mm.c:950 drm_mm_takedown+0x34/0x44 ... drm_mm_takedown+0x34/0x44 rockchip_drm_unbind+0x64/0x8c component_master_del+0x88/0xb8 rockchip_drm_platform_remove+0x2c/0x44 rockchip_drm_platform_shutdown+0x20/0x2c platform_drv_shutdown+0x2c/0x38 device_shutdown+0x164/0x1b8 kernel_restart_prepare+0x40/0x48 kernel_restart+0x20/0x68 ... [2] https://patchwork.kernel.org/patch/10556151/ https://www.spinics.net/lists/linux-rockchip/msg21342.html [PATCH] drm/rockchip: shutdown drm subsystem on shutdown Fixes: 7f3ef5dedb14 ("drm/rockchip: Allow driver to be shutdown on reboot/kexec") Cc: Jeffy Chen <jeffy.chen@rock-chips.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Vicente Bergas <vicencb@gmail.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: stable@vger.kernel.org Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patchwork.freedesktop.org/patch/msgid/20181205181657.177703-1-briannorris@chromium.org
1 parent b31a3ca
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 6.3 KB |
Makefile | -rw-r--r-- | 1.6 KB |
altera-cvp.c | -rw-r--r-- | 14.1 KB |
altera-fpga2sdram.c | -rw-r--r-- | 4.9 KB |
altera-freeze-bridge.c | -rw-r--r-- | 6.8 KB |
altera-hps2fpga.c | -rw-r--r-- | 5.8 KB |
altera-pr-ip-core-plat.c | -rw-r--r-- | 1.4 KB |
altera-pr-ip-core.c | -rw-r--r-- | 5.0 KB |
altera-ps-spi.c | -rw-r--r-- | 7.7 KB |
dfl-afu-dma-region.c | -rw-r--r-- | 11.6 KB |
dfl-afu-main.c | -rw-r--r-- | 14.5 KB |
dfl-afu-region.c | -rw-r--r-- | 4.1 KB |
dfl-afu.h | -rw-r--r-- | 2.9 KB |
dfl-fme-br.c | -rw-r--r-- | 2.5 KB |
dfl-fme-main.c | -rw-r--r-- | 6.3 KB |
dfl-fme-mgr.c | -rw-r--r-- | 9.2 KB |
dfl-fme-pr.c | -rw-r--r-- | 11.5 KB |
dfl-fme-pr.h | -rw-r--r-- | 2.0 KB |
dfl-fme-region.c | -rw-r--r-- | 2.1 KB |
dfl-fme.h | -rw-r--r-- | 1.0 KB |
dfl-pci.c | -rw-r--r-- | 6.1 KB |
dfl.c | -rw-r--r-- | 25.8 KB |
dfl.h | -rw-r--r-- | 12.1 KB |
fpga-bridge.c | -rw-r--r-- | 12.3 KB |
fpga-mgr.c | -rw-r--r-- | 19.2 KB |
fpga-region.c | -rw-r--r-- | 8.5 KB |
ice40-spi.c | -rw-r--r-- | 5.4 KB |
machxo2-spi.c | -rw-r--r-- | 9.3 KB |
of-fpga-region.c | -rw-r--r-- | 12.1 KB |
socfpga-a10.c | -rw-r--r-- | 15.3 KB |
socfpga.c | -rw-r--r-- | 17.0 KB |
ts73xx-fpga.c | -rw-r--r-- | 4.3 KB |
xilinx-pr-decoupler.c | -rw-r--r-- | 4.1 KB |
xilinx-spi.c | -rw-r--r-- | 4.9 KB |
zynq-fpga.c | -rw-r--r-- | 17.5 KB |
Computing file changes ...