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.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 F3D6DFA372C for ; Thu, 7 Nov 2019 02:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C73662178F for ; Thu, 7 Nov 2019 02:31:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Zma5HXTv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732064AbfKGCbT (ORCPT ); Wed, 6 Nov 2019 21:31:19 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:47404 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731985AbfKGCbT (ORCPT ); Wed, 6 Nov 2019 21:31:19 -0500 Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B48B3329; Thu, 7 Nov 2019 03:31:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1573093876; bh=FaOsKKRqnjdtla6VGKZJ8ZS4dIrIKm/aqwfxO6NMUPo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Zma5HXTvfEZD2d3ccsp1M/Ut7eHpZ4XYsLZCzr+LB7p0O0QSW3O48TmeQcbxOFNPg hYBd5kErlXe7Uvoe0W7d3ISyyYhmULWrZ4oa94h0Cvg7TaaKj6zEMAvmDOcaYUjmuZ YLksRHT4WkT34bpf/VR/UefkGzu2XbTvDieRHKcc= Date: Thu, 7 Nov 2019 04:31:07 +0200 From: Laurent Pinchart To: Geert Uytterhoeven Cc: Kieran Bingham , David Airlie , Daniel Vetter , Rob Herring , Mark Rutland , Magnus Damm , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 2/3] drm: rcar-du: Recognize "renesas,vsps" in addition to "vsps" Message-ID: <20191107023107.GL4878@pendragon.ideasonboard.com> References: <20191105183504.21447-1-geert+renesas@glider.be> <20191105183504.21447-3-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191105183504.21447-3-geert+renesas@glider.be> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Geert, Thank you for the patch. On Tue, Nov 05, 2019 at 07:35:03PM +0100, Geert Uytterhoeven wrote: > The Renesas-specific "vsps" property lacks a vendor prefix. > Add a "renesas," prefix to comply with DT best practises. > Retain backward compatibility with old DTBs by falling back to "vsps" > when needed. > > Fixes: 6d62ef3ac30be756 ("drm: rcar-du: Expose the VSP1 compositor through KMS planes") > Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart and taken in my tree (with a small change below). > --- > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > index 186422ac552b2870..b14676f7a9f17501 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -544,6 +544,7 @@ static int rcar_du_properties_init(struct rcar_du_device *rcdu) > static int rcar_du_vsps_init(struct rcar_du_device *rcdu) > { > const struct device_node *np = rcdu->dev->of_node; > + const char *vsps_prop_name = "renesas,vsps"; > struct of_phandle_args args; > struct { > struct device_node *np; > @@ -559,15 +560,21 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) > * entry contains a pointer to the VSP DT node and a bitmask of the > * connected DU CRTCs. > */ > - cells = of_property_count_u32_elems(np, "vsps") / rcdu->num_crtcs - 1; > + ret = of_property_count_u32_elems(np, vsps_prop_name); > + if (ret < 0) { > + /* Backward compatibility with old DTBs */ s/DTBs/DTBs./ > + vsps_prop_name = "vsps"; > + ret = of_property_count_u32_elems(np, vsps_prop_name); > + } > + cells = ret / rcdu->num_crtcs - 1; > if (cells > 1) > return -EINVAL; > > for (i = 0; i < rcdu->num_crtcs; ++i) { > unsigned int j; > > - ret = of_parse_phandle_with_fixed_args(np, "vsps", cells, i, > - &args); > + ret = of_parse_phandle_with_fixed_args(np, vsps_prop_name, > + cells, i, &args); > if (ret < 0) > goto error; > > @@ -589,8 +596,8 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) > > /* > * Store the VSP pointer and pipe index in the CRTC. If the > - * second cell of the 'vsps' specifier isn't present, default > - * to 0 to remain compatible with older DT bindings. > + * second cell of the 'renesas,vsps' specifier isn't present, > + * default to 0 to remain compatible with older DT bindings. > */ > rcdu->crtcs[i].vsp = &rcdu->vsps[j]; > rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0; -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH 2/3] drm: rcar-du: Recognize "renesas,vsps" in addition to "vsps" Date: Thu, 7 Nov 2019 04:31:07 +0200 Message-ID: <20191107023107.GL4878@pendragon.ideasonboard.com> References: <20191105183504.21447-1-geert+renesas@glider.be> <20191105183504.21447-3-geert+renesas@glider.be> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B4706EE73 for ; Thu, 7 Nov 2019 02:31:18 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20191105183504.21447-3-geert+renesas@glider.be> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Geert Uytterhoeven Cc: Mark Rutland , devicetree@vger.kernel.org, David Airlie , Kieran Bingham , Magnus Damm , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Rob Herring List-Id: dri-devel@lists.freedesktop.org SGkgR2VlcnQsCgpUaGFuayB5b3UgZm9yIHRoZSBwYXRjaC4KCk9uIFR1ZSwgTm92IDA1LCAyMDE5 IGF0IDA3OjM1OjAzUE0gKzAxMDAsIEdlZXJ0IFV5dHRlcmhvZXZlbiB3cm90ZToKPiBUaGUgUmVu ZXNhcy1zcGVjaWZpYyAidnNwcyIgcHJvcGVydHkgbGFja3MgYSB2ZW5kb3IgcHJlZml4Lgo+IEFk ZCBhICJyZW5lc2FzLCIgcHJlZml4IHRvIGNvbXBseSB3aXRoIERUIGJlc3QgcHJhY3Rpc2VzLgo+ IFJldGFpbiBiYWNrd2FyZCBjb21wYXRpYmlsaXR5IHdpdGggb2xkIERUQnMgYnkgZmFsbGluZyBi YWNrIHRvICJ2c3BzIgo+IHdoZW4gbmVlZGVkLgo+IAo+IEZpeGVzOiA2ZDYyZWYzYWMzMGJlNzU2 ICgiZHJtOiByY2FyLWR1OiBFeHBvc2UgdGhlIFZTUDEgY29tcG9zaXRvciB0aHJvdWdoIEtNUyBw bGFuZXMiKQo+IFNpZ25lZC1vZmYtYnk6IEdlZXJ0IFV5dHRlcmhvZXZlbiA8Z2VlcnQrcmVuZXNh c0BnbGlkZXIuYmU+CgpSZXZpZXdlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5j aGFydEBpZGVhc29uYm9hcmQuY29tPgoKYW5kIHRha2VuIGluIG15IHRyZWUgKHdpdGggYSBzbWFs bCBjaGFuZ2UgYmVsb3cpLgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9k dV9rbXMuYyB8IDE3ICsrKysrKysrKysrKy0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNl cnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vcmNhci1kdS9yY2FyX2R1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9k dV9rbXMuYwo+IGluZGV4IDE4NjQyMmFjNTUyYjI4NzAuLmIxNDY3NmY3YTlmMTc1MDEgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21zLmMKPiBAQCAtNTQ0LDYgKzU0NCw3IEBA IHN0YXRpYyBpbnQgcmNhcl9kdV9wcm9wZXJ0aWVzX2luaXQoc3RydWN0IHJjYXJfZHVfZGV2aWNl ICpyY2R1KQo+ICBzdGF0aWMgaW50IHJjYXJfZHVfdnNwc19pbml0KHN0cnVjdCByY2FyX2R1X2Rl dmljZSAqcmNkdSkKPiAgewo+ICAJY29uc3Qgc3RydWN0IGRldmljZV9ub2RlICpucCA9IHJjZHUt PmRldi0+b2Zfbm9kZTsKPiArCWNvbnN0IGNoYXIgKnZzcHNfcHJvcF9uYW1lID0gInJlbmVzYXMs dnNwcyI7Cj4gIAlzdHJ1Y3Qgb2ZfcGhhbmRsZV9hcmdzIGFyZ3M7Cj4gIAlzdHJ1Y3Qgewo+ICAJ CXN0cnVjdCBkZXZpY2Vfbm9kZSAqbnA7Cj4gQEAgLTU1OSwxNSArNTYwLDIxIEBAIHN0YXRpYyBp bnQgcmNhcl9kdV92c3BzX2luaXQoc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1KQo+ICAJICog ZW50cnkgY29udGFpbnMgYSBwb2ludGVyIHRvIHRoZSBWU1AgRFQgbm9kZSBhbmQgYSBiaXRtYXNr IG9mIHRoZQo+ICAJICogY29ubmVjdGVkIERVIENSVENzLgo+ICAJICovCj4gLQljZWxscyA9IG9m X3Byb3BlcnR5X2NvdW50X3UzMl9lbGVtcyhucCwgInZzcHMiKSAvIHJjZHUtPm51bV9jcnRjcyAt IDE7Cj4gKwlyZXQgPSBvZl9wcm9wZXJ0eV9jb3VudF91MzJfZWxlbXMobnAsIHZzcHNfcHJvcF9u YW1lKTsKPiArCWlmIChyZXQgPCAwKSB7Cj4gKwkJLyogQmFja3dhcmQgY29tcGF0aWJpbGl0eSB3 aXRoIG9sZCBEVEJzICovCgpzL0RUQnMvRFRCcy4vCgo+ICsJCXZzcHNfcHJvcF9uYW1lID0gInZz cHMiOwo+ICsJCXJldCA9IG9mX3Byb3BlcnR5X2NvdW50X3UzMl9lbGVtcyhucCwgdnNwc19wcm9w X25hbWUpOwo+ICsJfQo+ICsJY2VsbHMgPSByZXQgLyByY2R1LT5udW1fY3J0Y3MgLSAxOwo+ICAJ aWYgKGNlbGxzID4gMSkKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgCj4gIAlmb3IgKGkgPSAwOyBp IDwgcmNkdS0+bnVtX2NydGNzOyArK2kpIHsKPiAgCQl1bnNpZ25lZCBpbnQgajsKPiAgCj4gLQkJ cmV0ID0gb2ZfcGFyc2VfcGhhbmRsZV93aXRoX2ZpeGVkX2FyZ3MobnAsICJ2c3BzIiwgY2VsbHMs IGksCj4gLQkJCQkJCSAgICAgICAmYXJncyk7Cj4gKwkJcmV0ID0gb2ZfcGFyc2VfcGhhbmRsZV93 aXRoX2ZpeGVkX2FyZ3MobnAsIHZzcHNfcHJvcF9uYW1lLAo+ICsJCQkJCQkgICAgICAgY2VsbHMs IGksICZhcmdzKTsKPiAgCQlpZiAocmV0IDwgMCkKPiAgCQkJZ290byBlcnJvcjsKPiAgCj4gQEAg LTU4OSw4ICs1OTYsOCBAQCBzdGF0aWMgaW50IHJjYXJfZHVfdnNwc19pbml0KHN0cnVjdCByY2Fy X2R1X2RldmljZSAqcmNkdSkKPiAgCj4gIAkJLyoKPiAgCQkgKiBTdG9yZSB0aGUgVlNQIHBvaW50 ZXIgYW5kIHBpcGUgaW5kZXggaW4gdGhlIENSVEMuIElmIHRoZQo+IC0JCSAqIHNlY29uZCBjZWxs IG9mIHRoZSAndnNwcycgc3BlY2lmaWVyIGlzbid0IHByZXNlbnQsIGRlZmF1bHQKPiAtCQkgKiB0 byAwIHRvIHJlbWFpbiBjb21wYXRpYmxlIHdpdGggb2xkZXIgRFQgYmluZGluZ3MuCj4gKwkJICog c2Vjb25kIGNlbGwgb2YgdGhlICdyZW5lc2FzLHZzcHMnIHNwZWNpZmllciBpc24ndCBwcmVzZW50 LAo+ICsJCSAqIGRlZmF1bHQgdG8gMCB0byByZW1haW4gY29tcGF0aWJsZSB3aXRoIG9sZGVyIERU IGJpbmRpbmdzLgo+ICAJCSAqLwo+ICAJCXJjZHUtPmNydGNzW2ldLnZzcCA9ICZyY2R1LT52c3Bz W2pdOwo+ICAJCXJjZHUtPmNydGNzW2ldLnZzcF9waXBlID0gY2VsbHMgPj0gMSA/IGFyZ3MuYXJn c1swXSA6IDA7CgotLSAKUmVnYXJkcywKCkxhdXJlbnQgUGluY2hhcnQKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs