Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1667766

[PATCH] drm: hdlcd: Update PM code to save/restore console.

Show all headers | View raw

Update the PM code to suspend/resume the fbdev_cma console.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
---
 drivers/gpu/drm/arm/hdlcd_drv.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index d3da87fbd85a..89cd408cde6f 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -13,6 +13,7 @@
 #include <linux/spinlock.h>
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/console.h>
 #include <linux/list.h>
 #include <linux/of_graph.h>
 #include <linux/of_reserved_mem.h>
@@ -435,9 +436,15 @@ static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 		return 0;
 
 	drm_kms_helper_poll_disable(drm);
+	console_lock();
+	drm_fbdev_cma_set_suspend(hdlcd->fbdev, 1);
+	console_unlock();
 
 	hdlcd->state = drm_atomic_helper_suspend(drm);
 	if (IS_ERR(hdlcd->state)) {
+		console_lock();
+		drm_fbdev_cma_set_suspend(hdlcd->fbdev, 0);
+		console_unlock();
 		drm_kms_helper_poll_enable(drm);
 		return PTR_ERR(hdlcd->state);
 	}
@@ -454,8 +461,10 @@ static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 		return 0;
 
 	drm_atomic_helper_resume(drm, hdlcd->state);
+	console_lock();
+	drm_fbdev_cma_set_suspend(hdlcd->fbdev, 0);
+	console_unlock();
 	drm_kms_helper_poll_enable(drm);
-	pm_runtime_set_active(dev);
 
 	return 0;
 }
-- 
2.13.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm: hdlcd: Update PM code to save/restore console. Liviu Dudau <Liviu.Dudau@arm.com> - 2017-06-16 16:00 +0200
  Re: [PATCH] drm: hdlcd: Update PM code to save/restore console. Noralf Trønnes <noralf@tronnes.org> - 2017-06-16 19:00 +0200
    Re: [PATCH] drm: hdlcd: Update PM code to save/restore console. Liviu Dudau <Liviu.Dudau@arm.com> - 2017-06-19 15:20 +0200
      Re: [PATCH] drm: hdlcd: Update PM code to save/restore console. Noralf Trønnes <noralf@tronnes.org> - 2017-06-19 17:50 +0200
    [PATCH v2] drm: hdlcd: Update PM code to save/restore console. Liviu Dudau <Liviu.Dudau@arm.com> - 2017-06-19 16:00 +0200
      Re: [PATCH v2] drm: hdlcd: Update PM code to save/restore console. Noralf Trønnes <noralf@tronnes.org> - 2017-06-19 17:50 +0200
        Re: [PATCH v2] drm: hdlcd: Update PM code to save/restore console. Liviu Dudau <Liviu.Dudau@arm.com> - 2017-06-19 18:20 +0200

csiph-web