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 |
|---|---|---|
| acpica | ||
| apei | ||
| arm64 | ||
| dptf | ||
| nfit | ||
| pmic | ||
| x86 | ||
| Kconfig | -rw-r--r-- | 18.5 KB |
| Makefile | -rw-r--r-- | 3.7 KB |
| ac.c | -rw-r--r-- | 11.7 KB |
| acpi_adxl.c | -rw-r--r-- | 4.7 KB |
| acpi_amba.c | -rw-r--r-- | 2.8 KB |
| acpi_apd.c | -rw-r--r-- | 6.0 KB |
| acpi_cmos_rtc.c | -rw-r--r-- | 2.1 KB |
| acpi_configfs.c | -rw-r--r-- | 6.4 KB |
| acpi_dbg.c | -rw-r--r-- | 18.2 KB |
| acpi_extlog.c | -rw-r--r-- | 8.7 KB |
| acpi_ipmi.c | -rw-r--r-- | 17.0 KB |
| acpi_lpat.c | -rw-r--r-- | 4.4 KB |
| acpi_lpit.c | -rw-r--r-- | 4.6 KB |
| acpi_lpss.c | -rw-r--r-- | 32.4 KB |
| acpi_memhotplug.c | -rw-r--r-- | 10.3 KB |
| acpi_pad.c | -rw-r--r-- | 12.5 KB |
| acpi_platform.c | -rw-r--r-- | 4.0 KB |
| acpi_pnp.c | -rw-r--r-- | 13.7 KB |
| acpi_processor.c | -rw-r--r-- | 17.8 KB |
| acpi_tad.c | -rw-r--r-- | 15.6 KB |
| acpi_video.c | -rw-r--r-- | 57.9 KB |
| acpi_watchdog.c | -rw-r--r-- | 4.5 KB |
| battery.c | -rw-r--r-- | 44.7 KB |
| bgrt.c | -rw-r--r-- | 3.0 KB |
| blacklist.c | -rw-r--r-- | 4.3 KB |
| bus.c | -rw-r--r-- | 33.4 KB |
| button.c | -rw-r--r-- | 17.8 KB |
| cm_sbs.c | -rw-r--r-- | 2.8 KB |
| container.c | -rw-r--r-- | 3.3 KB |
| cppc_acpi.c | -rw-r--r-- | 40.0 KB |
| custom_method.c | -rw-r--r-- | 2.0 KB |
| debugfs.c | -rw-r--r-- | 422 bytes |
| device_pm.c | -rw-r--r-- | 35.4 KB |
| device_sysfs.c | -rw-r--r-- | 16.6 KB |
| dock.c | -rw-r--r-- | 17.1 KB |
| ec.c | -rw-r--r-- | 56.1 KB |
| ec_sys.c | -rw-r--r-- | 3.5 KB |
| event.c | -rw-r--r-- | 4.3 KB |
| evged.c | -rw-r--r-- | 4.6 KB |
| fan.c | -rw-r--r-- | 10.6 KB |
| glue.c | -rw-r--r-- | 9.0 KB |
| hed.c | -rw-r--r-- | 2.3 KB |
| internal.h | -rw-r--r-- | 9.0 KB |
| ioapic.c | -rw-r--r-- | 6.1 KB |
| irq.c | -rw-r--r-- | 8.2 KB |
| numa.c | -rw-r--r-- | 12.7 KB |
| nvs.c | -rw-r--r-- | 4.6 KB |
| osi.c | -rw-r--r-- | 13.4 KB |
| osl.c | -rw-r--r-- | 42.4 KB |
| pci_irq.c | -rw-r--r-- | 14.1 KB |
| pci_link.c | -rw-r--r-- | 24.2 KB |
| pci_mcfg.c | -rw-r--r-- | 8.3 KB |
| pci_root.c | -rw-r--r-- | 25.6 KB |
| pci_slot.c | -rw-r--r-- | 5.1 KB |
| power.c | -rw-r--r-- | 22.5 KB |
| pptt.c | -rw-r--r-- | 20.5 KB |
| proc.c | -rw-r--r-- | 3.6 KB |
| processor_core.c | -rw-r--r-- | 9.1 KB |
| processor_driver.c | -rw-r--r-- | 8.8 KB |
| processor_idle.c | -rw-r--r-- | 38.3 KB |
| processor_pdc.c | -rw-r--r-- | 4.7 KB |
| processor_perflib.c | -rw-r--r-- | 20.1 KB |
| processor_thermal.c | -rw-r--r-- | 6.5 KB |
| processor_throttling.c | -rw-r--r-- | 31.6 KB |
| property.c | -rw-r--r-- | 34.6 KB |
| reboot.c | -rw-r--r-- | 1.4 KB |
| resource.c | -rw-r--r-- | 23.2 KB |
| sbs.c | -rw-r--r-- | 20.1 KB |
| sbshc.c | -rw-r--r-- | 7.2 KB |
| sbshc.h | -rw-r--r-- | 999 bytes |
| scan.c | -rw-r--r-- | 57.8 KB |
| sleep.c | -rw-r--r-- | 31.5 KB |
| sleep.h | -rw-r--r-- | 507 bytes |
| spcr.c | -rw-r--r-- | 5.8 KB |
| sysfs.c | -rw-r--r-- | 27.3 KB |
| tables.c | -rw-r--r-- | 21.1 KB |
| thermal.c | -rw-r--r-- | 32.0 KB |
| utils.c | -rw-r--r-- | 22.7 KB |
| video_detect.c | -rw-r--r-- | 12.5 KB |
| wakeup.c | -rw-r--r-- | 2.7 KB |
Computing file changes ...
