From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/4] drm/simple_kms_helper: Add {enable|disable}_vblank callback support Date: Thu, 22 Feb 2018 17:59:16 +0100 Message-ID: <20180222165916.GD6419@phenom.ffwll.local> References: <1518425574-32671-1-git-send-email-andr2000@gmail.com> <1518425574-32671-2-git-send-email-andr2000@gmail.com> <00b01a2d-ad16-e171-f52f-88fba2896386@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F89C6E028 for ; Thu, 22 Feb 2018 16:59:21 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id t82so4860467wmt.5 for ; Thu, 22 Feb 2018 08:59:21 -0800 (PST) Content-Disposition: inline In-Reply-To: <00b01a2d-ad16-e171-f52f-88fba2896386@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Oleksandr Andrushchenko Cc: airlied@linux.ie, daniel.vetter@intel.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Oleksandr Andrushchenko List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBGZWIgMTksIDIwMTggYXQgMTE6MTE6MjNBTSArMDIwMCwgT2xla3NhbmRyIEFuZHJ1 c2hjaGVua28gd3JvdGU6Cj4gcGluZwo+IE9uIDAyLzEyLzIwMTggMTA6NTIgQU0sIE9sZWtzYW5k ciBBbmRydXNoY2hlbmtvIHdyb3RlOgo+ID4gRnJvbTogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28g PG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVwYW0uY29tPgo+ID4gCj4gPiBJZiBzaW1wbGVfa21z X2hlbHBlciBiYXNlZCBkcml2ZXIgbmVlZHMgdG8gd29yayB3aXRoIHZibGFua3MsCj4gPiB0aGVu IGl0IGhhcyB0byBwcm92aWRlIGRybV9kcml2ZXIue2VuYWJsZXxkaXNhYmxlfV92YmxhbmsgY2Fs bGJhY2tzLAo+ID4gYmVjYXVzZSBkcm1fc2ltcGxlX2ttc19oZWxwZXIuZHJtX2NydGNfZnVuY3Mg ZG9lcyBub3QgcHJvdmlkZSBhbnkuCj4gPiBBdCB0aGUgc2FtZSB0aW1lIGRybV9kcml2ZXIue2Vu YWJsZXxkaXNhYmxlfV92YmxhbmsgY2FsbGJhY2tzCj4gPiBhcmUgbWFya2VkIGFzIGRlcHJlY2F0 ZWQgYW5kIHNob3VsZG4ndCBiZSB1c2VkIGJ5IG5ldyBkcml2ZXJzLgo+ID4gCj4gPiBGaXggdGhp cyBieSBleHRlbmRpbmcgZHJtX3NpbXBsZV9rbXNfaGVscGVyLmRybV9jcnRjX2Z1bmNzCj4gPiB0 byBwcm92aWRlIHRoZSBtaXNzaW5nIGNhbGxiYWNrcy4KPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTog T2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVwYW0uY29t PgoKbGd0bSwgYWxsIDQgYXBwbGllZCwgdGhhbmtzIGZvciB5b3VyIHBhdGNoZXMuCi1EYW5pZWwK Cj4gPiAtLS0KPiA+ICAgZHJpdmVycy9ncHUvZHJtL2RybV9zaW1wbGVfa21zX2hlbHBlci5jIHwg MjQgKysrKysrKysrKysrKysrKysrKysrKysrCj4gPiAgIGluY2x1ZGUvZHJtL2RybV9zaW1wbGVf a21zX2hlbHBlci5oICAgICB8IDE4ICsrKysrKysrKysrKysrKysrKwo+ID4gICAyIGZpbGVzIGNo YW5nZWQsIDQyIGluc2VydGlvbnMoKykKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxl X2ttc19oZWxwZXIuYwo+ID4gaW5kZXggOWQzZjZiNzA4MTJjLi45Y2E4YTRhNTliNzQgMTAwNjQ0 Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMKPiA+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYwo+ID4gQEAgLTc3LDYg Kzc3LDI4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIGRybV9z aW1wbGVfa21zX2NydGNfaGVscGVyX2Z1bmNzID0gewo+ID4gICAJLmF0b21pY19kaXNhYmxlID0g ZHJtX3NpbXBsZV9rbXNfY3J0Y19kaXNhYmxlLAo+ID4gICB9Owo+ID4gK3N0YXRpYyBpbnQgZHJt X3NpbXBsZV9rbXNfY3J0Y19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiA+ ICt7Cj4gPiArCXN0cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlwZSAqcGlwZTsKPiA+ICsKPiA+ ICsJcGlwZSA9IGNvbnRhaW5lcl9vZihjcnRjLCBzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNwbGF5X3Bp cGUsIGNydGMpOwo+ID4gKwlpZiAoIXBpcGUtPmZ1bmNzIHx8ICFwaXBlLT5mdW5jcy0+ZW5hYmxl X3ZibGFuaykKPiA+ICsJCXJldHVybiAwOwo+ID4gKwo+ID4gKwlyZXR1cm4gcGlwZS0+ZnVuY3Mt PmVuYWJsZV92YmxhbmsocGlwZSk7Cj4gPiArfQo+ID4gKwo+ID4gK3N0YXRpYyB2b2lkIGRybV9z aW1wbGVfa21zX2NydGNfZGlzYWJsZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ID4g K3sKPiA+ICsJc3RydWN0IGRybV9zaW1wbGVfZGlzcGxheV9waXBlICpwaXBlOwo+ID4gKwo+ID4g KwlwaXBlID0gY29udGFpbmVyX29mKGNydGMsIHN0cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlw ZSwgY3J0Yyk7Cj4gPiArCWlmICghcGlwZS0+ZnVuY3MgfHwgIXBpcGUtPmZ1bmNzLT5kaXNhYmxl X3ZibGFuaykKPiA+ICsJCXJldHVybjsKPiA+ICsKPiA+ICsJcGlwZS0+ZnVuY3MtPmRpc2FibGVf dmJsYW5rKHBpcGUpOwo+ID4gK30KPiA+ICsKPiA+ICAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f Y3J0Y19mdW5jcyBkcm1fc2ltcGxlX2ttc19jcnRjX2Z1bmNzID0gewo+ID4gICAJLnJlc2V0ID0g ZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCwKPiA+ICAgCS5kZXN0cm95ID0gZHJtX2NydGNf Y2xlYW51cCwKPiA+IEBAIC04NCw2ICsxMDYsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9j cnRjX2Z1bmNzIGRybV9zaW1wbGVfa21zX2NydGNfZnVuY3MgPSB7Cj4gPiAgIAkucGFnZV9mbGlw ID0gZHJtX2F0b21pY19oZWxwZXJfcGFnZV9mbGlwLAo+ID4gICAJLmF0b21pY19kdXBsaWNhdGVf c3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jcnRjX2R1cGxpY2F0ZV9zdGF0ZSwKPiA+ICAgCS5h dG9taWNfZGVzdHJveV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0 ZSwKPiA+ICsJLmVuYWJsZV92YmxhbmsgPSBkcm1fc2ltcGxlX2ttc19jcnRjX2VuYWJsZV92Ymxh bmssCj4gPiArCS5kaXNhYmxlX3ZibGFuayA9IGRybV9zaW1wbGVfa21zX2NydGNfZGlzYWJsZV92 YmxhbmssCj4gPiAgIH07Cj4gPiAgIHN0YXRpYyBpbnQgZHJtX3NpbXBsZV9rbXNfcGxhbmVfYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ID4gZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9zaW1wbGVfa21zX2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX3NpbXBsZV9r bXNfaGVscGVyLmgKPiA+IGluZGV4IDZkOWFkYmI0NjI5My4uNzk1Njc4MjZiMDk5IDEwMDY0NAo+ ID4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmgKPiA+ICsrKyBiL2lu Y2x1ZGUvZHJtL2RybV9zaW1wbGVfa21zX2hlbHBlci5oCj4gPiBAQCAtOTMsNiArOTMsMjQgQEAg c3RydWN0IGRybV9zaW1wbGVfZGlzcGxheV9waXBlX2Z1bmNzIHsKPiA+ICAgCSAqLwo+ID4gICAJ dm9pZCAoKmNsZWFudXBfZmIpKHN0cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlwZSAqcGlwZSwK PiA+ICAgCQkJICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwo+ID4gKwo+ ID4gKwkvKioKPiA+ICsJICogQGVuYWJsZV92Ymxhbms6Cj4gPiArCSAqCj4gPiArCSAqIE9wdGlv bmFsLCBjYWxsZWQgYnkgJmRybV9jcnRjX2Z1bmNzLmVuYWJsZV92YmxhbmsuIFBsZWFzZSByZWFk Cj4gPiArCSAqIHRoZSBkb2N1bWVudGF0aW9uIGZvciB0aGUgJmRybV9jcnRjX2Z1bmNzLmVuYWJs ZV92YmxhbmsgaG9vayBmb3IKPiA+ICsJICogbW9yZSBkZXRhaWxzLgo+ID4gKwkgKi8KPiA+ICsJ aW50ICgqZW5hYmxlX3ZibGFuaykoc3RydWN0IGRybV9zaW1wbGVfZGlzcGxheV9waXBlICpwaXBl KTsKPiA+ICsKPiA+ICsJLyoqCj4gPiArCSAqIEBkaXNhYmxlX3ZibGFuazoKPiA+ICsJICoKPiA+ ICsJICogT3B0aW9uYWwsIGNhbGxlZCBieSAmZHJtX2NydGNfZnVuY3MuZGlzYWJsZV92Ymxhbmsu IFBsZWFzZSByZWFkCj4gPiArCSAqIHRoZSBkb2N1bWVudGF0aW9uIGZvciB0aGUgJmRybV9jcnRj X2Z1bmNzLmRpc2FibGVfdmJsYW5rIGhvb2sgZm9yCj4gPiArCSAqIG1vcmUgZGV0YWlscy4KPiA+ ICsJICovCj4gPiArCXZvaWQgKCpkaXNhYmxlX3ZibGFuaykoc3RydWN0IGRybV9zaW1wbGVfZGlz cGxheV9waXBlICpwaXBlKTsKPiA+ICAgfTsKPiA+ICAgLyoqCj4gCj4gX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0 Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKRGFuaWVsIFZldHRlcgpT b2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933401AbeBVQ7Z (ORCPT ); Thu, 22 Feb 2018 11:59:25 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:38610 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933214AbeBVQ7V (ORCPT ); Thu, 22 Feb 2018 11:59:21 -0500 X-Google-Smtp-Source: AH8x226Pxi2UacQS6Rvt+A7A+lc/J1SkpJ2BOGOXiE8grCfj8WdhIN+C9lW3eDzZai42BAtwAN+QPw== Date: Thu, 22 Feb 2018 17:59:16 +0100 From: Daniel Vetter To: Oleksandr Andrushchenko Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel.vetter@intel.com, Oleksandr Andrushchenko Subject: Re: [PATCH 1/4] drm/simple_kms_helper: Add {enable|disable}_vblank callback support Message-ID: <20180222165916.GD6419@phenom.ffwll.local> Mail-Followup-To: Oleksandr Andrushchenko , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel.vetter@intel.com, Oleksandr Andrushchenko References: <1518425574-32671-1-git-send-email-andr2000@gmail.com> <1518425574-32671-2-git-send-email-andr2000@gmail.com> <00b01a2d-ad16-e171-f52f-88fba2896386@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <00b01a2d-ad16-e171-f52f-88fba2896386@gmail.com> X-Operating-System: Linux phenom 4.14.0-3-amd64 User-Agent: Mutt/1.9.3 (2018-01-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 19, 2018 at 11:11:23AM +0200, Oleksandr Andrushchenko wrote: > ping > On 02/12/2018 10:52 AM, Oleksandr Andrushchenko wrote: > > From: Oleksandr Andrushchenko > > > > If simple_kms_helper based driver needs to work with vblanks, > > then it has to provide drm_driver.{enable|disable}_vblank callbacks, > > because drm_simple_kms_helper.drm_crtc_funcs does not provide any. > > At the same time drm_driver.{enable|disable}_vblank callbacks > > are marked as deprecated and shouldn't be used by new drivers. > > > > Fix this by extending drm_simple_kms_helper.drm_crtc_funcs > > to provide the missing callbacks. > > > > Signed-off-by: Oleksandr Andrushchenko lgtm, all 4 applied, thanks for your patches. -Daniel > > --- > > drivers/gpu/drm/drm_simple_kms_helper.c | 24 ++++++++++++++++++++++++ > > include/drm/drm_simple_kms_helper.h | 18 ++++++++++++++++++ > > 2 files changed, 42 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c > > index 9d3f6b70812c..9ca8a4a59b74 100644 > > --- a/drivers/gpu/drm/drm_simple_kms_helper.c > > +++ b/drivers/gpu/drm/drm_simple_kms_helper.c > > @@ -77,6 +77,28 @@ static const struct drm_crtc_helper_funcs drm_simple_kms_crtc_helper_funcs = { > > .atomic_disable = drm_simple_kms_crtc_disable, > > }; > > +static int drm_simple_kms_crtc_enable_vblank(struct drm_crtc *crtc) > > +{ > > + struct drm_simple_display_pipe *pipe; > > + > > + pipe = container_of(crtc, struct drm_simple_display_pipe, crtc); > > + if (!pipe->funcs || !pipe->funcs->enable_vblank) > > + return 0; > > + > > + return pipe->funcs->enable_vblank(pipe); > > +} > > + > > +static void drm_simple_kms_crtc_disable_vblank(struct drm_crtc *crtc) > > +{ > > + struct drm_simple_display_pipe *pipe; > > + > > + pipe = container_of(crtc, struct drm_simple_display_pipe, crtc); > > + if (!pipe->funcs || !pipe->funcs->disable_vblank) > > + return; > > + > > + pipe->funcs->disable_vblank(pipe); > > +} > > + > > static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = { > > .reset = drm_atomic_helper_crtc_reset, > > .destroy = drm_crtc_cleanup, > > @@ -84,6 +106,8 @@ static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = { > > .page_flip = drm_atomic_helper_page_flip, > > .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > > .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > > + .enable_vblank = drm_simple_kms_crtc_enable_vblank, > > + .disable_vblank = drm_simple_kms_crtc_disable_vblank, > > }; > > static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, > > diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple_kms_helper.h > > index 6d9adbb46293..79567826b099 100644 > > --- a/include/drm/drm_simple_kms_helper.h > > +++ b/include/drm/drm_simple_kms_helper.h > > @@ -93,6 +93,24 @@ struct drm_simple_display_pipe_funcs { > > */ > > void (*cleanup_fb)(struct drm_simple_display_pipe *pipe, > > struct drm_plane_state *plane_state); > > + > > + /** > > + * @enable_vblank: > > + * > > + * Optional, called by &drm_crtc_funcs.enable_vblank. Please read > > + * the documentation for the &drm_crtc_funcs.enable_vblank hook for > > + * more details. > > + */ > > + int (*enable_vblank)(struct drm_simple_display_pipe *pipe); > > + > > + /** > > + * @disable_vblank: > > + * > > + * Optional, called by &drm_crtc_funcs.disable_vblank. Please read > > + * the documentation for the &drm_crtc_funcs.disable_vblank hook for > > + * more details. > > + */ > > + void (*disable_vblank)(struct drm_simple_display_pipe *pipe); > > }; > > /** > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch