From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from galahad.ideasonboard.com ([185.26.127.97]:38015 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751203AbdCCLZw (ORCPT ); Fri, 3 Mar 2017 06:25:52 -0500 From: Laurent Pinchart To: Jacopo Mondi Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH] drm: rcar-du: Make sure DRM planes are created by VSP1 Date: Fri, 03 Mar 2017 13:26:23 +0200 Message-ID: <2578296.10DKCH3R7T@avalon> In-Reply-To: <1488528578-26978-1-git-send-email-jacopo+renesas@jmondi.org> References: <1488528578-26978-1-git-send-email-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: Hi Jacopo, Thank you for the patch. On Friday 03 Mar 2017 09:09:38 Jacopo Mondi wrote: > On Gen3 platforms compositing planes are allocated by VSP on behalf of > DRM/KMS. > If VSP support is not compiled in, vsp1 initialization stub routine is > called, leading to invalid memory accesses later on when un-initialized > planes are accessed. > > Fail explicitly earlier if planes are not properly created. > > Signed-off-by: Jacopo Mondi > --- > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index b5d3f16..7f56c09 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -616,6 +616,9 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) > ret = rcar_du_vsp_init(vsp); > if (ret < 0) > return ret; > + > + if (!vsp->planes) > + return -EINVAL; Given that this code is only called when the DU hardware requires the VSP to operate, how about modifying the rcar_du_vsp_init() stub function to return - ENXIO instead of 0 ? That way you won't need to add an additional check here. Ideally we should require VSP through Kconfig as well. If you feel like submitting a patch (and testing it with various combinations of module and built-in) it would be appreciated. > } > } -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH] drm: rcar-du: Make sure DRM planes are created by VSP1 Date: Fri, 03 Mar 2017 13:26:23 +0200 Message-ID: <2578296.10DKCH3R7T@avalon> References: <1488528578-26978-1-git-send-email-jacopo+renesas@jmondi.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 593766ECDC for ; Fri, 3 Mar 2017 11:25:51 +0000 (UTC) In-Reply-To: <1488528578-26978-1-git-send-email-jacopo+renesas@jmondi.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jacopo Mondi Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SGkgSmFjb3BvLAoKVGhhbmsgeW91IGZvciB0aGUgcGF0Y2guCgpPbiBGcmlkYXkgMDMgTWFyIDIw MTcgMDk6MDk6MzggSmFjb3BvIE1vbmRpIHdyb3RlOgo+IE9uIEdlbjMgcGxhdGZvcm1zIGNvbXBv c2l0aW5nIHBsYW5lcyBhcmUgYWxsb2NhdGVkICBieSBWU1Agb24gYmVoYWxmIG9mCj4gRFJNL0tN Uy4KPiBJZiBWU1Agc3VwcG9ydCBpcyBub3QgY29tcGlsZWQgaW4sIHZzcDEgaW5pdGlhbGl6YXRp b24gc3R1YiByb3V0aW5lIGlzCj4gY2FsbGVkLCBsZWFkaW5nIHRvIGludmFsaWQgbWVtb3J5IGFj Y2Vzc2VzIGxhdGVyIG9uIHdoZW4gdW4taW5pdGlhbGl6ZWQKPiBwbGFuZXMgYXJlIGFjY2Vzc2Vk Lgo+IAo+IEZhaWwgZXhwbGljaXRseSBlYXJsaWVyIGlmIHBsYW5lcyBhcmUgbm90IHByb3Blcmx5 IGNyZWF0ZWQuCj4gCj4gU2lnbmVkLW9mZi1ieTogSmFjb3BvIE1vbmRpIDxqYWNvcG8rcmVuZXNh c0BqbW9uZGkub3JnPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2tt cy5jIHwgMyArKysKPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2ttcy5jCj4gYi9kcml2ZXJz L2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2ttcy5jIGluZGV4IGI1ZDNmMTYuLjdmNTZjMDkgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21zLmMKPiBAQCAtNjE2LDYgKzYxNiw5 IEBAIGludCByY2FyX2R1X21vZGVzZXRfaW5pdChzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUp Cj4gIAkJCXJldCA9IHJjYXJfZHVfdnNwX2luaXQodnNwKTsKPiAgCQkJaWYgKHJldCA8IDApCj4g IAkJCQlyZXR1cm4gcmV0Owo+ICsKPiArCQkJaWYgKCF2c3AtPnBsYW5lcykKPiArCQkJCXJldHVy biAtRUlOVkFMOwoKR2l2ZW4gdGhhdCB0aGlzIGNvZGUgaXMgb25seSBjYWxsZWQgd2hlbiB0aGUg RFUgaGFyZHdhcmUgcmVxdWlyZXMgdGhlIFZTUCB0byAKb3BlcmF0ZSwgaG93IGFib3V0IG1vZGlm eWluZyB0aGUgcmNhcl9kdV92c3BfaW5pdCgpIHN0dWIgZnVuY3Rpb24gdG8gcmV0dXJuIC0KRU5Y SU8gaW5zdGVhZCBvZiAwID8gVGhhdCB3YXkgeW91IHdvbid0IG5lZWQgdG8gYWRkIGFuIGFkZGl0 aW9uYWwgY2hlY2sgaGVyZS4KCklkZWFsbHkgd2Ugc2hvdWxkIHJlcXVpcmUgVlNQIHRocm91Z2gg S2NvbmZpZyBhcyB3ZWxsLiBJZiB5b3UgZmVlbCBsaWtlIApzdWJtaXR0aW5nIGEgcGF0Y2ggKGFu ZCB0ZXN0aW5nIGl0IHdpdGggdmFyaW91cyBjb21iaW5hdGlvbnMgb2YgbW9kdWxlIGFuZCAKYnVp bHQtaW4pIGl0IHdvdWxkIGJlIGFwcHJlY2lhdGVkLgoKPiAgCQl9Cj4gIAl9CgotLSAKUmVnYXJk cywKCkxhdXJlbnQgUGluY2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo=