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-- | 14.1 KB |
Makefile | -rw-r--r-- | 2.7 KB |
altera_edac.c | -rw-r--r-- | 59.5 KB |
altera_edac.h | -rw-r--r-- | 13.8 KB |
amd64_edac.c | -rw-r--r-- | 88.9 KB |
amd64_edac.h | -rw-r--r-- | 14.1 KB |
amd64_edac_dbg.c | -rw-r--r-- | 1.5 KB |
amd64_edac_inj.c | -rw-r--r-- | 6.2 KB |
amd76x_edac.c | -rw-r--r-- | 9.3 KB |
amd8111_edac.c | -rw-r--r-- | 16.5 KB |
amd8111_edac.h | -rw-r--r-- | 4.1 KB |
amd8131_edac.c | -rw-r--r-- | 10.7 KB |
amd8131_edac.h | -rw-r--r-- | 3.7 KB |
cell_edac.c | -rw-r--r-- | 7.7 KB |
cpc925_edac.c | -rw-r--r-- | 31.2 KB |
debugfs.c | -rw-r--r-- | 4.0 KB |
e752x_edac.c | -rw-r--r-- | 40.7 KB |
e7xxx_edac.c | -rw-r--r-- | 16.2 KB |
edac_device.c | -rw-r--r-- | 17.8 KB |
edac_device.h | -rw-r--r-- | 9.1 KB |
edac_device_sysfs.c | -rw-r--r-- | 23.2 KB |
edac_mc.c | -rw-r--r-- | 31.4 KB |
edac_mc.h | -rw-r--r-- | 7.9 KB |
edac_mc_sysfs.c | -rw-r--r-- | 27.4 KB |
edac_module.c | -rw-r--r-- | 3.3 KB |
edac_module.h | -rw-r--r-- | 4.6 KB |
edac_pci.c | -rw-r--r-- | 7.6 KB |
edac_pci.h | -rw-r--r-- | 6.8 KB |
edac_pci_sysfs.c | -rw-r--r-- | 18.9 KB |
fsl_ddr_edac.c | -rw-r--r-- | 15.4 KB |
fsl_ddr_edac.h | -rw-r--r-- | 2.3 KB |
ghes_edac.c | -rw-r--r-- | 14.1 KB |
highbank_l2_edac.c | -rw-r--r-- | 3.9 KB |
highbank_mc_edac.c | -rw-r--r-- | 7.4 KB |
i3000_edac.c | -rw-r--r-- | 13.8 KB |
i3200_edac.c | -rw-r--r-- | 12.8 KB |
i5000_edac.c | -rw-r--r-- | 42.3 KB |
i5100_edac.c | -rw-r--r-- | 30.2 KB |
i5400_edac.c | -rw-r--r-- | 40.0 KB |
i7300_edac.c | -rw-r--r-- | 35.3 KB |
i7core_edac.c | -rw-r--r-- | 61.5 KB |
i82443bxgx_edac.c | -rw-r--r-- | 13.6 KB |
i82860_edac.c | -rw-r--r-- | 9.1 KB |
i82875p_edac.c | -rw-r--r-- | 14.6 KB |
i82975x_edac.c | -rw-r--r-- | 18.3 KB |
ie31200_edac.c | -rw-r--r-- | 16.5 KB |
layerscape_edac.c | -rw-r--r-- | 1.6 KB |
mce_amd.c | -rw-r--r-- | 24.6 KB |
mce_amd.h | -rw-r--r-- | 1.7 KB |
mpc85xx_edac.c | -rw-r--r-- | 20.1 KB |
mpc85xx_edac.h | -rw-r--r-- | 3.0 KB |
mv64x60_edac.c | -rw-r--r-- | 21.7 KB |
mv64x60_edac.h | -rw-r--r-- | 3.2 KB |
octeon_edac-l2c.c | -rw-r--r-- | 5.3 KB |
octeon_edac-lmc.c | -rw-r--r-- | 8.5 KB |
octeon_edac-pc.c | -rw-r--r-- | 3.5 KB |
octeon_edac-pci.c | -rw-r--r-- | 2.7 KB |
pasemi_edac.c | -rw-r--r-- | 8.6 KB |
pnd2_edac.c | -rw-r--r-- | 43.1 KB |
pnd2_edac.h | -rw-r--r-- | 6.0 KB |
ppc4xx_edac.c | -rw-r--r-- | 39.3 KB |
ppc4xx_edac.h | -rw-r--r-- | 7.2 KB |
qcom_edac.c | -rw-r--r-- | 11.0 KB |
r82600_edac.c | -rw-r--r-- | 11.7 KB |
sb_edac.c | -rw-r--r-- | 94.2 KB |
skx_edac.c | -rw-r--r-- | 33.1 KB |
synopsys_edac.c | -rw-r--r-- | 13.4 KB |
thunderx_edac.c | -rw-r--r-- | 52.8 KB |
ti_edac.c | -rw-r--r-- | 8.6 KB |
wq.c | -rw-r--r-- | 782 bytes |
x38_edac.c | -rw-r--r-- | 12.0 KB |
xgene_edac.c | -rw-r--r-- | 59.7 KB |
Computing file changes ...