Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbbf2b3 authored by Artem Lapkin's avatar Artem Lapkin Committed by Greg Kroah-Hartman
Browse files

drm: meson_drv add shutdown function 



commit fa0c16caf3d73ab4d2e5d6fa2ef2394dbec91791 upstream.

Problem: random stucks on reboot stage about 1/20 stuck/reboots
// debug kernel log
[    4.496660] reboot: kernel restart prepare CMD:(null)
[    4.498114] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown begin
[    4.503949] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown domain 0:VPU...
...STUCK...

Solution: add shutdown function to meson_drm driver
// debug kernel log
[    5.231896] reboot: kernel restart prepare CMD:(null)
[    5.246135] [drm:meson_drv_shutdown]
...
[    5.259271] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown begin
[    5.274688] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown domain 0:VPU...
[    5.338331] reboot: Restarting system
[    5.358293] psci: PSCI_0_2_FN_SYSTEM_RESET reboot_mode:0 cmd:(null)
bl31 reboot reason: 0xd
bl31 reboot reason: 0x0
system cmd  1.
...REBOOT...

Tested: on VIM1 VIM2 VIM3 VIM3L khadas sbcs - 1000+ successful reboots
and Odroid boards, WeTek Play2 (GXBB)

Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
Signed-off-by: default avatarArtem Lapkin <art@khadas.com>
Tested-by: default avatarChristian Hewitt <christianshewitt@gmail.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210302042202.3728113-1-art@khadas.com


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8cd674e

drivers/gpu/drm/meson/meson_drv.c

+11 −0
Original line number Diff line number Diff line
@@ -384,6 +384,16 @@ static int meson_probe_remote(struct platform_device *pdev, 
	return count;

}



static void meson_drv_shutdown(struct platform_device *pdev)

{

	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);

	struct drm_device *drm = priv->drm;



	DRM_DEBUG_DRIVER("\n");

	drm_kms_helper_poll_fini(drm);

	drm_atomic_helper_shutdown(drm);

}



static int meson_drv_probe(struct platform_device *pdev)

{

	struct component_match *match = NULL;
@@ -428,6 +438,7 @@ MODULE_DEVICE_TABLE(of, dt_match); 


static struct platform_driver meson_drm_platform_driver = {

	.probe      = meson_drv_probe,

	.shutdown   = meson_drv_shutdown,

	.driver     = {

		.name	= "meson-drm",

		.of_match_table = dt_match,