From 877e7716c5c5c19f5e51b1cdd251b39e46f15aae Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Mon, 28 Feb 2022 09:16:37 +0800 Subject: [PATCH] drm/rockchip: analogix_dp: Move resume handling to NOIRQ phase Fixes: 1a4c9d772a99 ("drm/bridge: analogix_dp: Rework irq handling") Signed-off-by: Wyon Bi Change-Id: I8709ef94503a80e4c217f28b6d2855a2f4cedcd0 --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 -- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 99deba0d266c..483efe75dfbb 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1991,7 +1991,6 @@ EXPORT_SYMBOL_GPL(analogix_dp_remove); int analogix_dp_suspend(struct analogix_dp_device *dp) { - disable_irq(dp->irq); pm_runtime_force_suspend(dp->dev); return 0; @@ -2002,7 +2001,6 @@ int analogix_dp_resume(struct analogix_dp_device *dp) { pm_runtime_force_resume(dp->dev); analogix_dp_init(dp); - enable_irq(dp->irq); return 0; } diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 34adcc73238e..def3986c2b58 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -659,7 +659,7 @@ static __maybe_unused int rockchip_dp_runtime_resume(struct device *dev) } static const struct dev_pm_ops rockchip_dp_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(rockchip_dp_suspend, rockchip_dp_resume) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_dp_suspend, rockchip_dp_resume) SET_RUNTIME_PM_OPS(rockchip_dp_runtime_suspend, rockchip_dp_runtime_resume, NULL) };