From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH 24/25] drm: kirin: Pass driver data to crtc init and plane init Date: Wed, 24 Apr 2019 19:09:10 +0200 Message-ID: <20190424170910.GC21067@ravnborg.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> <1556061656-1733-25-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00D0789260 for ; Wed, 24 Apr 2019 17:09:13 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1556061656-1733-25-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Stultz Cc: Xu YiPing , David Airlie , Chen Feng , lkml , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org SGkgSm9obi4KCk9uIFR1ZSwgQXByIDIzLCAyMDE5IGF0IDA0OjIwOjU1UE0gLTA3MDAsIEpvaG4g U3R1bHR6IHdyb3RlOgo+IEZyb206IFh1IFlpUGluZyA8eHV5aXBpbmdAaGlzaWxpY29uLmNvbT4K PiAKPiBBcyBwYXJ0IG9mIHJlZmFjdG9yaW5nIHRoZSBraXJpbiBkcml2ZXIgdG8gYmV0dGVyIHN1 cHBvcnQKPiBkaWZmZXJlbnQgaGFyZHdhcmUgcmV2aXNpb25zLCB0aGlzIHBhdGNoIGNoYW5nZXMg ZnVuY2l0b25zCj4gdG8gcGFzcyB0aGUga2lyaW5fZHJpdmVyX2RhdGEgYXMgYSBwcmFtZXRlci4K PiAKPiBUaGlzIHdpbGwgYWxsb3cgdGhvc2UgZnVuY2l0b25zIHRvIGJlIGxhdGVyIG1vdmVkIHRv IHRoZQo+IGdlbmVyaWMga2lyaW5fZHJtX2Rydi5jCj4gCj4gQ2M6IFhpbmxpYW5nIExpdSA8ei5s aXV4aW5saWFuZ0BoaXNpbGljb24uY29tPgo+IENjOiBSb25ncm9uZyBab3UgPHpvdXJvbmdyb25n QGdtYWlsLmNvbT4KPiBDYzogWGlud2VpIEtvbmcgPGtvbmcua29uZ3hpbndlaUBoaXNpbGljb24u Y29tPgo+IENjOiBDaGVuIEZlbmcgPHB1Y2suY2hlbkBoaXNpbGljb24uY29tPgo+IENjOiBEYXZp ZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+Cj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBm ZndsbC5jaD4KPiBDYzogZHJpLWRldmVsIDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Pgo+IFNpZ25lZC1vZmYtYnk6IFh1IFlpUGluZyA8eHV5aXBpbmdAaGlzaWxpY29uLmNvbT4KPiBb anN0dWx0ejogUmV3b3JkZWQgY29tbWl0IG1lc3NhZ2VdCj4gU2lnbmVkLW9mZi1ieTogSm9obiBT dHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9o aXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIHwgMjUgKysrKysrKysrKysrKystLS0tLS0t LS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5f ZHJtX2FkZS5jIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRl LmMKPiBpbmRleCA3MTY3MWY4Li44NzZlMjViIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKPiBAQCAtNTcyLDcgKzU3Miw4IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgYWRlX2NydGNfZnVuY3MgPSB7Cj4gIH07 Cj4gIAo+ICBzdGF0aWMgaW50IGtpcmluX2RybV9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjLAo+IC0JCQkgc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpCj4gKwkJCQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiArCQkJCWNvbnN0IHN0cnVjdCBr aXJpbl9kcm1fZGF0YSAqZHJpdmVyX2RhdGEpCgpJbmRlbnQgbG9va3Mgd3JvbmcgaGVyZS4KCj4g IHsKPiAgCXN0cnVjdCBkZXZpY2Vfbm9kZSAqcG9ydDsKPiAgCWludCByZXQ7Cj4gQEAgLTU4OSwx MyArNTkwLDEzIEBAIHN0YXRpYyBpbnQga2lyaW5fZHJtX2NydGNfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAljcnRjLT5wb3J0ID0gcG9ydDsK PiAgCj4gIAlyZXQgPSBkcm1fY3J0Y19pbml0X3dpdGhfcGxhbmVzKGRldiwgY3J0YywgcGxhbmUs IE5VTEwsCj4gLQkJCQkJYWRlX2RyaXZlcl9kYXRhLmNydGNfZnVuY3MsIE5VTEwpOwo+ICsJCQkJ CWRyaXZlcl9kYXRhLT5jcnRjX2Z1bmNzLCBOVUxMKTsKPiAgCWlmIChyZXQpIHsKPiAgCQlEUk1f RVJST1IoImZhaWxlZCB0byBpbml0IGNydGMuXG4iKTsKPiAgCQlyZXR1cm4gcmV0Owo+ICAJfQo+ ICAKPiAtCWRybV9jcnRjX2hlbHBlcl9hZGQoY3J0YywgYWRlX2RyaXZlcl9kYXRhLmNydGNfaGVs cGVyX2Z1bmNzKTsKPiArCWRybV9jcnRjX2hlbHBlcl9hZGQoY3J0YywgZHJpdmVyX2RhdGEtPmNy dGNfaGVscGVyX2Z1bmNzKTsKPiAgCj4gIAlyZXR1cm4gMDsKPiAgfQoKCj4gQEAgLTg5NCwyMSAr ODk1LDIyIEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGFkZV9wbGFuZV9mdW5jcyA9 IHsKPiAgCj4gIHN0YXRpYyBpbnQga2lyaW5fZHJtX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgCQkJCXN0cnVjdCBraXJpbl9wbGFuZSAqa3BsYW5lLAo+IC0JCQkJZW51bSBk cm1fcGxhbmVfdHlwZSB0eXBlKQo+ICsJCQkJZW51bSBkcm1fcGxhbmVfdHlwZSB0eXBlLAo+ICsJ CQkJY29uc3Qgc3RydWN0IGtpcmluX2RybV9kYXRhICpkcml2ZXJfZGF0YSkKPiAgewo+ICAJaW50 IHJldCA9IDA7Cj4gIAo+ICAJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmtw bGFuZS0+YmFzZSwgMSwKPiArCQkJCWRyaXZlcl9kYXRhLT5wbGFuZV9mdW5jcywKPiArCQkJCWRy aXZlcl9kYXRhLT5jaGFubmVsX2Zvcm1hdHMsCj4gKwkJCQlkcml2ZXJfZGF0YS0+Y2hhbm5lbF9m b3JtYXRzX2NudCwKPiArCQkJCU5VTEwsIHR5cGUsIE5VTEwpOwpJbmRlbnQgbG9va3Mgd3Jvbmcg aGVyZS4KCkkgbWlzc2VkIHdoZXJlIGFkZV9kcml2ZXJfZGF0YSBjYW1lIGZyb20uClRoaXMgbG9v a3MgYW4gZXh0cmEgcGF0Y2ggdG8gaW50b2R1Y2UgZHJpdmVyX2RhdGEsCnRoYXQgbWF5YmUgc2hv dWxkIGJlIG1lcmdlZCB3aXRoIGFuIGVhcmxpZXIgdmVyc2lvbj8KCglTYW0KX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 014E6C10F11 for ; Wed, 24 Apr 2019 17:09:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB7312148D for ; Wed, 24 Apr 2019 17:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733103AbfDXRJQ (ORCPT ); Wed, 24 Apr 2019 13:09:16 -0400 Received: from asavdk3.altibox.net ([109.247.116.14]:32994 "EHLO asavdk3.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729842AbfDXRJP (ORCPT ); Wed, 24 Apr 2019 13:09:15 -0400 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id AEA20200A7; Wed, 24 Apr 2019 19:09:11 +0200 (CEST) Date: Wed, 24 Apr 2019 19:09:10 +0200 From: Sam Ravnborg To: John Stultz Cc: lkml , Xu YiPing , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou Subject: Re: [PATCH 24/25] drm: kirin: Pass driver data to crtc init and plane init Message-ID: <20190424170910.GC21067@ravnborg.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> <1556061656-1733-25-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1556061656-1733-25-git-send-email-john.stultz@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=dqr19Wo4 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=BTeA3XvPAAAA:8 a=pGLkceISAAAA:8 a=e5mUnYsNAAAA:8 a=KKAkSRfTAAAA:8 a=9WKW5R43fgoMaNO0QP4A:9 a=CjuIK1q_8ugA:10 a=tafbbOV3vt1XuEhzTjGK:22 a=Vxmtnl_E_bksehYqCbjh:22 a=cvBusfyB2V15izCimMoJ:22 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi John. On Tue, Apr 23, 2019 at 04:20:55PM -0700, John Stultz wrote: > From: Xu YiPing > > As part of refactoring the kirin driver to better support > different hardware revisions, this patch changes funcitons > to pass the kirin_driver_data as a prameter. > > This will allow those funcitons to be later moved to the > generic kirin_drm_drv.c > > Cc: Xinliang Liu > Cc: Rongrong Zou > Cc: Xinwei Kong > Cc: Chen Feng > Cc: David Airlie > Cc: Daniel Vetter > Cc: dri-devel > Signed-off-by: Xu YiPing > [jstultz: Reworded commit message] > Signed-off-by: John Stultz > --- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > index 71671f8..876e25b 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > @@ -572,7 +572,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { > }; > > static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > - struct drm_plane *plane) > + struct drm_plane *plane, > + const struct kirin_drm_data *driver_data) Indent looks wrong here. > { > struct device_node *port; > int ret; > @@ -589,13 +590,13 @@ static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > crtc->port = port; > > ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, > - ade_driver_data.crtc_funcs, NULL); > + driver_data->crtc_funcs, NULL); > if (ret) { > DRM_ERROR("failed to init crtc.\n"); > return ret; > } > > - drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); > + drm_crtc_helper_add(crtc, driver_data->crtc_helper_funcs); > > return 0; > } > @@ -894,21 +895,22 @@ static struct drm_plane_funcs ade_plane_funcs = { > > static int kirin_drm_plane_init(struct drm_device *dev, > struct kirin_plane *kplane, > - enum drm_plane_type type) > + enum drm_plane_type type, > + const struct kirin_drm_data *driver_data) > { > int ret = 0; > > ret = drm_universal_plane_init(dev, &kplane->base, 1, > + driver_data->plane_funcs, > + driver_data->channel_formats, > + driver_data->channel_formats_cnt, > + NULL, type, NULL); Indent looks wrong here. I missed where ade_driver_data came from. This looks an extra patch to intoduce driver_data, that maybe should be merged with an earlier version? Sam