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 |
---|---|---|
chips | ||
devices | ||
lpddr | ||
maps | ||
nand | ||
parsers | ||
spi-nor | ||
tests | ||
ubi | ||
Kconfig | -rw-r--r-- | 11.6 KB |
Makefile | -rw-r--r-- | 1.2 KB |
afs.c | -rw-r--r-- | 6.1 KB |
ar7part.c | -rw-r--r-- | 3.9 KB |
bcm47xxpart.c | -rw-r--r-- | 8.8 KB |
bcm63xxpart.c | -rw-r--r-- | 8.4 KB |
cmdlinepart.c | -rw-r--r-- | 10.7 KB |
ftl.c | -rw-r--r-- | 30.6 KB |
inftlcore.c | -rw-r--r-- | 24.5 KB |
inftlmount.c | -rw-r--r-- | 22.5 KB |
mtd_blkdevs.c | -rw-r--r-- | 14.2 KB |
mtdblock.c | -rw-r--r-- | 9.2 KB |
mtdblock_ro.c | -rw-r--r-- | 2.5 KB |
mtdchar.c | -rw-r--r-- | 25.7 KB |
mtdconcat.c | -rw-r--r-- | 21.1 KB |
mtdcore.c | -rw-r--r-- | 50.5 KB |
mtdcore.h | -rw-r--r-- | 880 bytes |
mtdoops.c | -rw-r--r-- | 11.3 KB |
mtdpart.c | -rw-r--r-- | 27.6 KB |
mtdsuper.c | -rw-r--r-- | 5.5 KB |
mtdswap.c | -rw-r--r-- | 34.3 KB |
nftlcore.c | -rw-r--r-- | 23.0 KB |
nftlmount.c | -rw-r--r-- | 25.9 KB |
ofpart.c | -rw-r--r-- | 5.8 KB |
redboot.c | -rw-r--r-- | 8.2 KB |
rfd_ftl.c | -rw-r--r-- | 17.6 KB |
sm_ftl.c | -rw-r--r-- | 30.0 KB |
sm_ftl.h | -rw-r--r-- | 2.4 KB |
ssfdc.c | -rw-r--r-- | 11.3 KB |
Computing file changes ...