From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752507AbeDSKiD (ORCPT ); Thu, 19 Apr 2018 06:38:03 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:40255 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbeDSKiC (ORCPT ); Thu, 19 Apr 2018 06:38:02 -0400 From: Philippe CORNU To: Vincent ABRIOU , Yannick FERTRE , Benjamin Gaignard , David Airlie , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" CC: Fabien DESSENNE , Mickael REULIER , Alexandre TORGUE Subject: Re: [PATCH] drm/stm: move enable/disable_vblank to crtc Thread-Topic: [PATCH] drm/stm: move enable/disable_vblank to crtc Thread-Index: AQHTzreb4oTyYPA5aUWEeiJExl0b0KQDBa6AgATQSQA= Date: Thu, 19 Apr 2018 10:37:50 +0000 Message-ID: References: <20180407212937.30407-1-philippe.cornu@st.com> <37da4f77-a518-7098-7677-fa28c6626092@st.com> In-Reply-To: <37da4f77-a518-7098-7677-fa28c6626092@st.com> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.75.127.123] Content-Type: text/plain; charset="utf-8" Content-ID: <79E0FFC0B157CA4E9F6FC8B0C73250B9@st.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-19_04:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id w3JAc8rQ021060 Applied on drm-misc-next. Many thanks, Philippe :-) On 04/16/2018 11:07 AM, Vincent ABRIOU wrote: > Hi Philippe, > > Patch looks good to me. > > Reviewed-by: Vincent Abriou > > On 04/07/2018 11:29 PM, Philippe Cornu wrote: >> enable/disable_vblank() functions at drm_driver level >> are deprecated. Move them to the ltdc drm_crtc_funcs >> structure. >> >> Signed-off-by: Philippe Cornu >> --- >> drivers/gpu/drm/stm/drv.c | 2 -- >> drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- >> drivers/gpu/drm/stm/ltdc.h | 2 -- >> 3 files changed, 6 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c >> index 9ab00a87f7cc..8698e08313e1 100644 >> --- a/drivers/gpu/drm/stm/drv.c >> +++ b/drivers/gpu/drm/stm/drv.c >> @@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { >> .gem_prime_vmap = drm_gem_cma_prime_vmap, >> .gem_prime_vunmap = drm_gem_cma_prime_vunmap, >> .gem_prime_mmap = drm_gem_cma_prime_mmap, >> - .enable_vblank = ltdc_crtc_enable_vblank, >> - .disable_vblank = ltdc_crtc_disable_vblank, >> }; >> >> static int drv_load(struct drm_device *ddev) >> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c >> index 1a3277e483d5..2b745cfc9000 100644 >> --- a/drivers/gpu/drm/stm/ltdc.c >> +++ b/drivers/gpu/drm/stm/ltdc.c >> @@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { >> .atomic_disable = ltdc_crtc_atomic_disable, >> }; >> >> -int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) >> +static int ltdc_crtc_enable_vblank(struct drm_crtc *crtc) >> { >> - struct ltdc_device *ldev = ddev->dev_private; >> + struct ltdc_device *ldev = crtc_to_ltdc(crtc); >> >> DRM_DEBUG_DRIVER("\n"); >> reg_set(ldev->regs, LTDC_IER, IER_LIE); >> @@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) >> return 0; >> } >> >> -void ltdc_crtc_disable_vblank(struct drm_device *ddev, unsigned int pipe) >> +static void ltdc_crtc_disable_vblank(struct drm_crtc *crtc) >> { >> - struct ltdc_device *ldev = ddev->dev_private; >> + struct ltdc_device *ldev = crtc_to_ltdc(crtc); >> >> DRM_DEBUG_DRIVER("\n"); >> reg_clear(ldev->regs, LTDC_IER, IER_LIE); >> @@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { >> .reset = drm_atomic_helper_crtc_reset, >> .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, >> .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, >> + .enable_vblank = ltdc_crtc_enable_vblank, >> + .disable_vblank = ltdc_crtc_disable_vblank, >> .gamma_set = drm_atomic_helper_legacy_gamma_set, >> }; >> >> diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h >> index edb268129c54..61a80d00bc3b 100644 >> --- a/drivers/gpu/drm/stm/ltdc.h >> +++ b/drivers/gpu/drm/stm/ltdc.h >> @@ -29,8 +29,6 @@ struct ltdc_device { >> u32 irq_status; >> }; >> >> -int ltdc_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe); >> -void ltdc_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe); >> int ltdc_load(struct drm_device *ddev); >> void ltdc_unload(struct drm_device *ddev); >> From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philippe CORNU Subject: Re: [PATCH] drm/stm: move enable/disable_vblank to crtc Date: Thu, 19 Apr 2018 10:37:50 +0000 Message-ID: References: <20180407212937.30407-1-philippe.cornu@st.com> <37da4f77-a518-7098-7677-fa28c6626092@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52C8C6E611 for ; Thu, 19 Apr 2018 10:38:00 +0000 (UTC) In-Reply-To: <37da4f77-a518-7098-7677-fa28c6626092@st.com> Content-Language: en-US Content-ID: <79E0FFC0B157CA4E9F6FC8B0C73250B9@st.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Vincent ABRIOU , Yannick FERTRE , Benjamin Gaignard , David Airlie , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Cc: Mickael REULIER , Alexandre TORGUE , Fabien DESSENNE List-Id: dri-devel@lists.freedesktop.org QXBwbGllZCBvbiBkcm0tbWlzYy1uZXh0Lg0KTWFueSB0aGFua3MsDQpQaGlsaXBwZSA6LSkNCg0K T24gMDQvMTYvMjAxOCAxMTowNyBBTSwgVmluY2VudCBBQlJJT1Ugd3JvdGU6DQo+IEhpIFBoaWxp cHBlLA0KPiANCj4gUGF0Y2ggbG9va3MgZ29vZCB0byBtZS4NCj4gDQo+IFJldmlld2VkLWJ5OiBW aW5jZW50IEFicmlvdSA8dmluY2VudC5hYnJpb3VAc3QuY29tPg0KPiANCj4gT24gMDQvMDcvMjAx OCAxMToyOSBQTSwgUGhpbGlwcGUgQ29ybnUgd3JvdGU6DQo+PiBlbmFibGUvZGlzYWJsZV92Ymxh bmsoKSBmdW5jdGlvbnMgYXQgZHJtX2RyaXZlciBsZXZlbA0KPj4gYXJlIGRlcHJlY2F0ZWQuIE1v dmUgdGhlbSB0byB0aGUgbHRkYyBkcm1fY3J0Y19mdW5jcw0KPj4gc3RydWN0dXJlLg0KPj4NCj4+ IFNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIENvcm51IDxwaGlsaXBwZS5jb3JudUBzdC5jb20+DQo+ PiAtLS0NCj4+ICAgIGRyaXZlcnMvZ3B1L2RybS9zdG0vZHJ2LmMgIHwgIDIgLS0NCj4+ICAgIGRy aXZlcnMvZ3B1L2RybS9zdG0vbHRkYy5jIHwgMTAgKysrKysrLS0tLQ0KPj4gICAgZHJpdmVycy9n cHUvZHJtL3N0bS9sdGRjLmggfCAgMiAtLQ0KPj4gICAgMyBmaWxlcyBjaGFuZ2VkLCA2IGluc2Vy dGlvbnMoKyksIDggZGVsZXRpb25zKC0pDQo+Pg0KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9zdG0vZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vc3RtL2Rydi5jDQo+PiBpbmRleCA5YWIw MGE4N2Y3Y2MuLjg2OThlMDgzMTNlMSAxMDA2NDQNCj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9z dG0vZHJ2LmMNCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdG0vZHJ2LmMNCj4+IEBAIC03Miw4 ICs3Miw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBkcnZfZHJpdmVyID0gew0KPj4gICAg CS5nZW1fcHJpbWVfdm1hcCA9IGRybV9nZW1fY21hX3ByaW1lX3ZtYXAsDQo+PiAgICAJLmdlbV9w cmltZV92dW5tYXAgPSBkcm1fZ2VtX2NtYV9wcmltZV92dW5tYXAsDQo+PiAgICAJLmdlbV9wcmlt ZV9tbWFwID0gZHJtX2dlbV9jbWFfcHJpbWVfbW1hcCwNCj4+IC0JLmVuYWJsZV92YmxhbmsgPSBs dGRjX2NydGNfZW5hYmxlX3ZibGFuaywNCj4+IC0JLmRpc2FibGVfdmJsYW5rID0gbHRkY19jcnRj X2Rpc2FibGVfdmJsYW5rLA0KPj4gICAgfTsNCj4+ICAgIA0KPj4gICAgc3RhdGljIGludCBkcnZf bG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGRldikNCj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vc3RtL2x0ZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9zdG0vbHRkYy5jDQo+PiBpbmRleCAx YTMyNzdlNDgzZDUuLjJiNzQ1Y2ZjOTAwMCAxMDA2NDQNCj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9zdG0vbHRkYy5jDQo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuYw0KPj4gQEAg LTU2OSw5ICs1NjksOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5j cyBsdGRjX2NydGNfaGVscGVyX2Z1bmNzID0gew0KPj4gICAgCS5hdG9taWNfZGlzYWJsZSA9IGx0 ZGNfY3J0Y19hdG9taWNfZGlzYWJsZSwNCj4+ICAgIH07DQo+PiAgICANCj4+IC1pbnQgbHRkY19j cnRjX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRkZXYsIHVuc2lnbmVkIGludCBw aXBlKQ0KPj4gK3N0YXRpYyBpbnQgbHRkY19jcnRjX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9j cnRjICpjcnRjKQ0KPj4gICAgew0KPj4gLQlzdHJ1Y3QgbHRkY19kZXZpY2UgKmxkZXYgPSBkZGV2 LT5kZXZfcHJpdmF0ZTsNCj4+ICsJc3RydWN0IGx0ZGNfZGV2aWNlICpsZGV2ID0gY3J0Y190b19s dGRjKGNydGMpOw0KPj4gICAgDQo+PiAgICAJRFJNX0RFQlVHX0RSSVZFUigiXG4iKTsNCj4+ICAg IAlyZWdfc2V0KGxkZXYtPnJlZ3MsIExURENfSUVSLCBJRVJfTElFKTsNCj4+IEBAIC01NzksOSAr NTc5LDkgQEAgaW50IGx0ZGNfY3J0Y19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpk ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkNCj4+ICAgIAlyZXR1cm4gMDsNCj4+ICAgIH0NCj4+ICAg IA0KPj4gLXZvaWQgbHRkY19jcnRjX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpk ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkNCj4+ICtzdGF0aWMgdm9pZCBsdGRjX2NydGNfZGlzYWJs ZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpjcnRjKQ0KPj4gICAgew0KPj4gLQlzdHJ1Y3QgbHRk Y19kZXZpY2UgKmxkZXYgPSBkZGV2LT5kZXZfcHJpdmF0ZTsNCj4+ICsJc3RydWN0IGx0ZGNfZGV2 aWNlICpsZGV2ID0gY3J0Y190b19sdGRjKGNydGMpOw0KPj4gICAgDQo+PiAgICAJRFJNX0RFQlVH X0RSSVZFUigiXG4iKTsNCj4+ICAgIAlyZWdfY2xlYXIobGRldi0+cmVncywgTFREQ19JRVIsIElF Ul9MSUUpOw0KPj4gQEAgLTU5NCw2ICs1OTQsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9j cnRjX2Z1bmNzIGx0ZGNfY3J0Y19mdW5jcyA9IHsNCj4+ICAgIAkucmVzZXQgPSBkcm1fYXRvbWlj X2hlbHBlcl9jcnRjX3Jlc2V0LA0KPj4gICAgCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJt X2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUsDQo+PiAgICAJLmF0b21pY19kZXN0 cm95X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlLA0KPj4gKwku ZW5hYmxlX3ZibGFuayA9IGx0ZGNfY3J0Y19lbmFibGVfdmJsYW5rLA0KPj4gKwkuZGlzYWJsZV92 YmxhbmsgPSBsdGRjX2NydGNfZGlzYWJsZV92YmxhbmssDQo+PiAgICAJLmdhbW1hX3NldCA9IGRy bV9hdG9taWNfaGVscGVyX2xlZ2FjeV9nYW1tYV9zZXQsDQo+PiAgICB9Ow0KPj4gICAgDQo+PiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmggYi9kcml2ZXJzL2dwdS9kcm0v c3RtL2x0ZGMuaA0KPj4gaW5kZXggZWRiMjY4MTI5YzU0Li42MWE4MGQwMGJjM2IgMTAwNjQ0DQo+ PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuaA0KPj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL3N0bS9sdGRjLmgNCj4+IEBAIC0yOSw4ICsyOSw2IEBAIHN0cnVjdCBsdGRjX2RldmljZSB7 DQo+PiAgICAJdTMyIGlycV9zdGF0dXM7DQo+PiAgICB9Ow0KPj4gICAgDQo+PiAtaW50IGx0ZGNf Y3J0Y19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBw aXBlKTsNCj4+IC12b2lkIGx0ZGNfY3J0Y19kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSk7DQo+PiAgICBpbnQgbHRkY19sb2FkKHN0cnVjdCBk cm1fZGV2aWNlICpkZGV2KTsNCj4+ICAgIHZvaWQgbHRkY191bmxvYWQoc3RydWN0IGRybV9kZXZp Y2UgKmRkZXYpOw0KPj4gICAgCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=