From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Mon, 23 Feb 2015 11:09:40 +0100 Subject: [PATCHv3 1/2] drm: atmel-hlcdc: Add PM suspend/resume support In-Reply-To: <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> References: <1424627464-16869-1-git-send-email-sylvain.rochet@finsecur.com> <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> Message-ID: <54EAFC64.1050209@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 02/22/2015 06:51 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 Reviewed-by: Andrzej Hajda Regards Andrzej > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 47 ++++++++++++++++++++++++++++ > 1 file changed, 47 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..c4bb1f9 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -559,6 +559,52 @@ 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); > + struct drm_crtc *crtc; > + > + if (pm_runtime_suspended(dev)) > + return 0; > + > + drm_modeset_lock_all(drm_dev); > + list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + if (crtc->enabled) { > + crtc_funcs->disable(crtc); > + /* save enable state for resume */ > + crtc->enabled = true; > + } > + } > + drm_modeset_unlock_all(drm_dev); > + return 0; > +} > + > +static int atmel_hlcdc_dc_drm_resume(struct device *dev) > +{ > + struct drm_device *drm_dev = dev_get_drvdata(dev); > + struct drm_crtc *crtc; > + > + if (pm_runtime_suspended(dev)) > + return 0; > + > + drm_modeset_lock_all(drm_dev); > + list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + if (crtc->enabled) { > + crtc->enabled = false; > + crtc_funcs->enable(crtc); > + } > + } > + drm_modeset_unlock_all(drm_dev); > + return 0; > +} > +#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 +615,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, > }, > }; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Hajda Subject: Re: [PATCHv3 1/2] drm: atmel-hlcdc: Add PM suspend/resume support Date: Mon, 23 Feb 2015 11:09:40 +0100 Message-ID: <54EAFC64.1050209@samsung.com> References: <1424627464-16869-1-git-send-email-sylvain.rochet@finsecur.com> <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C45A89919 for ; Mon, 23 Feb 2015 02:10:03 -0800 (PST) Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NK700L75Z3B5N80@mailout4.w1.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 23 Feb 2015 10:13:59 +0000 (GMT) In-reply-to: <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 List-Id: dri-devel@lists.freedesktop.org T24gMDIvMjIvMjAxNSAwNjo1MSBQTSwgU3lsdmFpbiBSb2NoZXQgd3JvdGU6Cj4gT24gc3VzcGVu ZDogc3dpdGNoIG9mZiBDUlRDIGlmIG5vdCBhbHJlYWR5IHN1c3BlbmRlZCB3aXRoIHJ1bnRpbWUg UE0KPiAKPiBPbiByZXN1bWU6IHN3aXRjaCBvbiBDUlRDIGlmIHdlIHdlcmUgbm90IGFscmVhZHkg c3VzcGVuZGVkIGZyb20gcnVudGltZQo+IFBNIHdoaWxlIHN1c3BlbmRpbmcuCj4gCj4gU2lnbmVk LW9mZi1ieTogU3lsdmFpbiBSb2NoZXQgPHN5bHZhaW4ucm9jaGV0QGZpbnNlY3VyLmNvbT4KClJl dmlld2VkLWJ5OiBBbmRyemVqIEhhamRhIDxhLmhhamRhQHNhbXN1bmcuY29tPgoKUmVnYXJkcwpB bmRyemVqCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRtZWxfaGxjZGNf ZGMuYyB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgMSBmaWxlIGNoYW5nZWQs IDQ3IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2F0bWVs LWhsY2RjL2F0bWVsX2hsY2RjX2RjLmMgYi9kcml2ZXJzL2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRt ZWxfaGxjZGNfZGMuYwo+IGluZGV4IDIyYzNjY2EuLmM0YmIxZjkgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2RjLmMKPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRtZWxfaGxjZGNfZGMuYwo+IEBAIC01NTksNiArNTU5LDUy IEBAIHN0YXRpYyBpbnQgYXRtZWxfaGxjZGNfZGNfZHJtX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gKyNpZmRlZiBDT05GSUdfUE0K PiArc3RhdGljIGludCBhdG1lbF9obGNkY19kY19kcm1fc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpk ZXYpCj4gK3sKPiArCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gZGV2X2dldF9kcnZkYXRh KGRldik7Cj4gKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4gKwo+ICsJaWYgKHBtX3J1bnRpbWVf c3VzcGVuZGVkKGRldikpCj4gKwkJcmV0dXJuIDA7Cj4gKwo+ICsJZHJtX21vZGVzZXRfbG9ja19h bGwoZHJtX2Rldik7Cj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkcm1fZGV2LT5tb2Rl X2NvbmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsKPiArCQlzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1 bmNzICpjcnRjX2Z1bmNzID0gY3J0Yy0+aGVscGVyX3ByaXZhdGU7Cj4gKwkJaWYgKGNydGMtPmVu YWJsZWQpIHsKPiArCQkJY3J0Y19mdW5jcy0+ZGlzYWJsZShjcnRjKTsKPiArCQkJLyogc2F2ZSBl bmFibGUgc3RhdGUgZm9yIHJlc3VtZSAqLwo+ICsJCQljcnRjLT5lbmFibGVkID0gdHJ1ZTsKPiAr CQl9Cj4gKwl9Cj4gKwlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRybV9kZXYpOwo+ICsJcmV0dXJu IDA7Cj4gK30KPiArCj4gK3N0YXRpYyBpbnQgYXRtZWxfaGxjZGNfZGNfZHJtX3Jlc3VtZShzdHJ1 Y3QgZGV2aWNlICpkZXYpCj4gK3sKPiArCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gZGV2 X2dldF9kcnZkYXRhKGRldik7Cj4gKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4gKwo+ICsJaWYg KHBtX3J1bnRpbWVfc3VzcGVuZGVkKGRldikpCj4gKwkJcmV0dXJuIDA7Cj4gKwo+ICsJZHJtX21v ZGVzZXRfbG9ja19hbGwoZHJtX2Rldik7Cj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZk cm1fZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsKPiArCQlzdHJ1Y3QgZHJtX2Ny dGNfaGVscGVyX2Z1bmNzICpjcnRjX2Z1bmNzID0gY3J0Yy0+aGVscGVyX3ByaXZhdGU7Cj4gKwkJ aWYgKGNydGMtPmVuYWJsZWQpIHsKPiArCQkJY3J0Yy0+ZW5hYmxlZCA9IGZhbHNlOwo+ICsJCQlj cnRjX2Z1bmNzLT5lbmFibGUoY3J0Yyk7Cj4gKwkJfQo+ICsJfQo+ICsJZHJtX21vZGVzZXRfdW5s b2NrX2FsbChkcm1fZGV2KTsKPiArCXJldHVybiAwOwo+ICt9Cj4gKyNlbmRpZgo+ICsKPiArc3Rh dGljIFNJTVBMRV9ERVZfUE1fT1BTKGF0bWVsX2hsY2RjX2RjX2RybV9wbV9vcHMsCj4gKwkJYXRt ZWxfaGxjZGNfZGNfZHJtX3N1c3BlbmQsIGF0bWVsX2hsY2RjX2RjX2RybV9yZXN1bWUpOwo+ICsK PiAgc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgYXRtZWxfaGxjZGNfZGNfb2ZfbWF0 Y2hbXSA9IHsKPiAgCXsgLmNvbXBhdGlibGUgPSAiYXRtZWwsaGxjZGMtZGlzcGxheS1jb250cm9s bGVyIiB9LAo+ICAJeyB9LAo+IEBAIC01NjksNiArNjE1LDcgQEAgc3RhdGljIHN0cnVjdCBwbGF0 Zm9ybV9kcml2ZXIgYXRtZWxfaGxjZGNfZGNfcGxhdGZvcm1fZHJpdmVyID0gewo+ICAJLnJlbW92 ZQk9IGF0bWVsX2hsY2RjX2RjX2RybV9yZW1vdmUsCj4gIAkuZHJpdmVyCT0gewo+ICAJCS5uYW1l CT0gImF0bWVsLWhsY2RjLWRpc3BsYXktY29udHJvbGxlciIsCj4gKwkJLnBtCT0gJmF0bWVsX2hs Y2RjX2RjX2RybV9wbV9vcHMsCj4gIAkJLm9mX21hdGNoX3RhYmxlID0gYXRtZWxfaGxjZGNfZGNf b2ZfbWF0Y2gsCj4gIAl9LAo+ICB9Owo+IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752241AbbBWKKG (ORCPT ); Mon, 23 Feb 2015 05:10:06 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:43403 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbbBWKKE (ORCPT ); Mon, 23 Feb 2015 05:10:04 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-24-54eafbe70b36 Message-id: <54EAFC64.1050209@samsung.com> Date: Mon, 23 Feb 2015 11:09:40 +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 Newsgroups: gmane.linux.kernel,gmane.comp.video.dri.devel,gmane.linux.ports.arm.kernel 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: [PATCHv3 1/2] drm: atmel-hlcdc: Add PM suspend/resume support References: <1424627464-16869-1-git-send-email-sylvain.rochet@finsecur.com> <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> In-reply-to: <1424627464-16869-2-git-send-email-sylvain.rochet@finsecur.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRmVeSWpSXmKPExsVy+t/xK7rPf78KMbh4XdKi99xJJouOa4uZ LA68WMhi8X/bRGaLK1/fs1k83fyYyWLT42usFpd3zWGz+Ha5md1i3cMXTBY31/WyWNz+tYHF gcdjwa+tLB57vy1g8fhxZzqjx5NNFxk9Xl24w+KxaVUnm8f2bw9YPe53H2fy2Lyk3uPzJrkA rigum5TUnMyy1CJ9uwSujCfP7zMX7BapOH15OWsD40uBLkZODgkBE4kzWx+yQNhiEhfurWfr YuTiEBJYyiix4Oo9FgjnE6PEnssfGEGqeAW0JFb/2ccGYrMIqEqcvnMCLM4moCnxd/NNsLio QITE/GOvmSHqBSV+TL4HtoEPKH7j4nwmkKEiAk0sEuvebQFrFhbwkph76gkTxLZeRonnWxay giQ4BXwkFn16BlTEwcEsoCdx/6IWSJhZQF5i85q3zBMYBWYh2TELoWoWkqoFjMyrGEVTS5ML ipPScw31ihNzi0vz0vWS83M3MUIi6csOxsXHrA4xCnAwKvHwPih7FSLEmlhWXJl7iFGCg1lJ hFf6J1CINyWxsiq1KD++qDQntfgQIxMHp1QDY9rTTZeubli98MFq9vyKqv7jnjb79y5ssXxY xXPj2j3JXbJTdhos6nHdFXd3x5OMw9lTQ+asZry/M+xGbOaqokkHpXJTJzs8cykSFzBYGbny bpLIwv+CDNO+6O45Xdhl3L908/XHJ7mCVx6bvq9/vbln0UezvMV9kVm/w9XtTs6c8OHf6aD5 hm5KLMUZiYZazEXFiQCsvVIfggIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/22/2015 06:51 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 Reviewed-by: Andrzej Hajda Regards Andrzej > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 47 ++++++++++++++++++++++++++++ > 1 file changed, 47 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..c4bb1f9 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -559,6 +559,52 @@ 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); > + struct drm_crtc *crtc; > + > + if (pm_runtime_suspended(dev)) > + return 0; > + > + drm_modeset_lock_all(drm_dev); > + list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + if (crtc->enabled) { > + crtc_funcs->disable(crtc); > + /* save enable state for resume */ > + crtc->enabled = true; > + } > + } > + drm_modeset_unlock_all(drm_dev); > + return 0; > +} > + > +static int atmel_hlcdc_dc_drm_resume(struct device *dev) > +{ > + struct drm_device *drm_dev = dev_get_drvdata(dev); > + struct drm_crtc *crtc; > + > + if (pm_runtime_suspended(dev)) > + return 0; > + > + drm_modeset_lock_all(drm_dev); > + list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head) { > + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > + if (crtc->enabled) { > + crtc->enabled = false; > + crtc_funcs->enable(crtc); > + } > + } > + drm_modeset_unlock_all(drm_dev); > + return 0; > +} > +#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 +615,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, > }, > }; >