From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933128AbbBQJrk (ORCPT ); Tue, 17 Feb 2015 04:47:40 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:27871 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754891AbbBQJrh (ORCPT ); Tue, 17 Feb 2015 04:47:37 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-4a-54e30da5a1cf Message-id: <54E30E2B.5070407@samsung.com> Date: Tue, 17 Feb 2015 10:47:23 +0100 From: Andrzej Hajda User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-version: 1.0 To: Sylvain Rochet , Boris Brezillon , David Airlie , dri-devel@lists.freedesktop.org, Nicolas Ferre , Jean-Christophe Plagniol-Villard , Alexandre Belloni , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Vetter , Kevin Hilman , Wenyou Yang Subject: Re: [PATCHv2 1/2] drm: atmel-hlcdc: Add PM suspend/resume support References: <1423774163-4752-1-git-send-email-sylvain.rochet@finsecur.com> <1423774163-4752-2-git-send-email-sylvain.rochet@finsecur.com> In-reply-to: <1423774163-4752-2-git-send-email-sylvain.rochet@finsecur.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsVy+t/xy7pLeR+HGBy9rmPRe+4kk0XHtcVM FgdeLGSx+L9tIrPFla/v2Syebn7MZLHp8TVWi8u75rBZfLvczG6x7uELJoub63pZLG7/2sDi wOOx4NdWFo+93xawePy4M53R48mmi4wery7cYfHYtKqTzWP7twesHve7jzN5bF5S7/F5k1wA VxSXTUpqTmZZapG+XQJXxps71gXX5Cq6J15jbmBcINnFyMkhIWAisX7JHiYIW0ziwr31bF2M XBxCAksZJR6vOM8KkhAS+MQocfV/JojNK6Al8WjzckYQm0VAVeLC2yZ2EJtNQFPi7+abbCC2 qECExPxjr5kh6gUlfky+xwIyVESgiUVi3bstYM3CAl4St358glrQzSjxcqoIiM0p4C3xY083 0FAODmYBPYn7F7VAwswC8hKb17xlnsDIPwvJ2FkIVbOQVC1gZF7FKJpamlxQnJSea6hXnJhb XJqXrpecn7uJERIrX3YwLj5mdYhRgINRiYc3YOmjECHWxLLiytxDjBIczEoivLteA4V4UxIr q1KL8uOLSnNSiw8xMnFwSjUwbvzyoHLJ1hsGCydXn7dtnXiZPc8gcU6/YPeMIFWTtz7aE0rr c16pp22+Nm+D3nZHBtNrt1W0H5p8jzx/5uqU/WwL2lX1j01LD5f2F/x3r2GGzTm92sypc3Ty Vc7ZTqs2C2cze/aYwepMbXfy0sULH9usqzrLkfjZ/FbIVj+/A1wd25rqTup5K7EUZyQaajEX FScCAIOkwalzAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sylvain, Few comments below. On 02/12/2015 09:49 PM, Sylvain Rochet wrote: > On suspend: switch off CRTC if not already suspended with runtime PM > > On resume: switch on CRTC if we were not already suspended from runtime > PM while suspending. > > Signed-off-by: Sylvain Rochet > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 60 ++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 22c3cca..e22883b 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -427,6 +427,36 @@ static void atmel_hlcdc_dc_lastclose(struct drm_device *dev) > drm_fbdev_cma_restore_mode(dc->fbdev); > } > > +static int atmel_hlcdc_dc_suspend(struct drm_device *dev, pm_message_t state) > +{ > + struct drm_crtc *crtc; > + > + drm_modeset_lock_all(dev); > + > + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + crtc_funcs->disable(crtc); > + } > + > + drm_modeset_unlock_all(dev); > + return 0; > +} > + > +static int atmel_hlcdc_dc_resume(struct drm_device *dev) > +{ > + struct drm_crtc *crtc; > + > + drm_modeset_lock_all(dev); > + > + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + crtc_funcs->enable(crtc); What about crtc's which were disabled before suspend, they will be enabled here unconditionally. > + } > + > + drm_modeset_unlock_all(dev); > + return 0; > +} > + > static int atmel_hlcdc_dc_irq_postinstall(struct drm_device *dev) > { > struct atmel_hlcdc_dc *dc = dev->dev_private; > @@ -488,6 +518,8 @@ static struct drm_driver atmel_hlcdc_dc_driver = { > .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET, > .preclose = atmel_hlcdc_dc_preclose, > .lastclose = atmel_hlcdc_dc_lastclose, > + .suspend = atmel_hlcdc_dc_suspend, > + .resume = atmel_hlcdc_dc_resume, These callbacks are obsolete and should not be used, additionally core don't call them if drm_device have DRIVER_MODESET flag. > .irq_handler = atmel_hlcdc_dc_irq_handler, > .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, > .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, > @@ -559,6 +591,33 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmel_hlcdc_dc_drm_suspend(struct device *dev) > +{ > + struct drm_device *drm_dev = dev_get_drvdata(dev); > + pm_message_t message; > + > + if (pm_runtime_suspended(dev) || !drm_dev) Nitpick, !drm_dev is always false, is not? > + return 0; > + > + message.event = PM_EVENT_SUSPEND; > + return atmel_hlcdc_dc_suspend(drm_dev, message); If you remove obsolete callbacks you can move suspend code here, the same for resume. > +} > + > +static int atmel_hlcdc_dc_drm_resume(struct device *dev) > +{ > + struct drm_device *drm_dev = dev_get_drvdata(dev); > + > + if (pm_runtime_suspended(dev) || !drm_dev) > + return 0; > + > + return atmel_hlcdc_dc_resume(drm_dev); Ditto x2 Regards Andrzej > +} > +#endif > + > +static SIMPLE_DEV_PM_OPS(atmel_hlcdc_dc_drm_pm_ops, > + atmel_hlcdc_dc_drm_suspend, atmel_hlcdc_dc_drm_resume); > + > static const struct of_device_id atmel_hlcdc_dc_of_match[] = { > { .compatible = "atmel,hlcdc-display-controller" }, > { }, > @@ -569,6 +628,7 @@ static struct platform_driver atmel_hlcdc_dc_platform_driver = { > .remove = atmel_hlcdc_dc_drm_remove, > .driver = { > .name = "atmel-hlcdc-display-controller", > + .pm = &atmel_hlcdc_dc_drm_pm_ops, > .of_match_table = atmel_hlcdc_dc_of_match, > }, > }; >