From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753736AbdKKMr3 (ORCPT ); Sat, 11 Nov 2017 07:47:29 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:46988 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752484AbdKKMr1 (ORCPT ); Sat, 11 Nov 2017 07:47:27 -0500 From: Laurent Pinchart To: Liviu Dudau Cc: Daniel Vetter , Jani Nikula , Sean Paul , David Airlie , Brian Starkey , Mali DP Maintainers , DRI-devel , LKML , intel-gfx@lists.freedesktop.org, Liviu Dudau Subject: Re: [PATCH v2] drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1 Date: Sat, 11 Nov 2017 14:47:35 +0200 Message-ID: <26071297.cMn4QuKrlS@avalon> Organization: Ideas on Board Oy In-Reply-To: <20171110133310.1225-1-Liviu.Dudau@arm.com> References: <2213365.Z1vsgl9bDt@avalon> <20171110133310.1225-1-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Liviu, Thank you for the patch. On Friday, 10 November 2017 15:33:10 EET Liviu Dudau wrote: > drm_gem_cma_prime_import_sg_table() will fail if the number of entries > in the sg_table > 1. However, you can have a device that uses an IOMMU > engine and can map a discontiguous buffer with multiple entries that > have consecutive sg_dma_addresses, effectively making it contiguous. > Allow for that scenario by testing the entries in the sg_table for > contiguous coverage. > > Reviewed-by: Laurent Pinchart > Signed-off-by: Liviu Dudau > --- > > Laurent, > > Thanks for the review! I would like to ask for one more favour: if you > are OK with this version, can you pull this patch through the drm-misc tree? I could, but I'd first need to set dim up, and I'm currently abroad with a bad internet connection and a big deadline for the middle of next week (I know, lots of excuses), so it's not very convenient for me at this time. > drivers/gpu/drm/drm_gem_cma_helper.c | 22 ++++++++++++++++++++-- > include/drm/drm_gem_cma_helper.h | 4 +++- > 2 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c > b/drivers/gpu/drm/drm_gem_cma_helper.c index 020e7668dfaba..43b179212052d > 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c > @@ -482,8 +482,26 @@ drm_gem_cma_prime_import_sg_table(struct drm_device > *dev, { > struct drm_gem_cma_object *cma_obj; > > - if (sgt->nents != 1) > - return ERR_PTR(-EINVAL); > + if (sgt->nents != 1) { > + /* check if the entries in the sg_table are contiguous */ > + dma_addr_t next_addr = sg_dma_address(sgt->sgl); > + struct scatterlist *s; > + unsigned int i; > + > + for_each_sg(sgt->sgl, s, sgt->nents, i) { > + /* > + * sg_dma_address(s) is only valid for entries > + * that have sg_dma_len(s) != 0 > + */ > + if (!sg_dma_len(s)) > + continue; > + > + if (sg_dma_address(s) != next_addr) > + return ERR_PTR(-EINVAL); > + > + next_addr = sg_dma_address(s) + sg_dma_len(s); > + } > + } > > /* Create a CMA GEM buffer. */ > cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size); > diff --git a/include/drm/drm_gem_cma_helper.h > b/include/drm/drm_gem_cma_helper.h index 58a739bf15f1f..214aa85adc8d5 > 100644 > --- a/include/drm/drm_gem_cma_helper.h > +++ b/include/drm/drm_gem_cma_helper.h > @@ -8,7 +8,9 @@ > * struct drm_gem_cma_object - GEM object backed by CMA memory allocations > * @base: base GEM object > * @paddr: physical address of the backing memory > - * @sgt: scatter/gather table for imported PRIME buffers > + * @sgt: scatter/gather table for imported PRIME buffers. The table can > have + * more than one entry but they are guaranteed to have > contiguous + * DMA addresses. > * @vaddr: kernel virtual address of the backing memory > */ > struct drm_gem_cma_object { -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v2] drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1 Date: Sat, 11 Nov 2017 14:47:35 +0200 Message-ID: <26071297.cMn4QuKrlS@avalon> References: <2213365.Z1vsgl9bDt@avalon> <20171110133310.1225-1-Liviu.Dudau@arm.com> 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 [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 190586E14C for ; Sat, 11 Nov 2017 12:47:29 +0000 (UTC) In-Reply-To: <20171110133310.1225-1-Liviu.Dudau@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau Cc: David Airlie , intel-gfx@lists.freedesktop.org, Liviu Dudau , LKML , DRI-devel , Mali DP Maintainers , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org SGkgTGl2aXUsCgpUaGFuayB5b3UgZm9yIHRoZSBwYXRjaC4KCk9uIEZyaWRheSwgMTAgTm92ZW1i ZXIgMjAxNyAxNTozMzoxMCBFRVQgTGl2aXUgRHVkYXUgd3JvdGU6Cj4gZHJtX2dlbV9jbWFfcHJp bWVfaW1wb3J0X3NnX3RhYmxlKCkgd2lsbCBmYWlsIGlmIHRoZSBudW1iZXIgb2YgZW50cmllcwo+ IGluIHRoZSBzZ190YWJsZSA+IDEuIEhvd2V2ZXIsIHlvdSBjYW4gaGF2ZSBhIGRldmljZSB0aGF0 IHVzZXMgYW4gSU9NTVUKPiBlbmdpbmUgYW5kIGNhbiBtYXAgYSBkaXNjb250aWd1b3VzIGJ1ZmZl ciB3aXRoIG11bHRpcGxlIGVudHJpZXMgdGhhdAo+IGhhdmUgY29uc2VjdXRpdmUgc2dfZG1hX2Fk ZHJlc3NlcywgZWZmZWN0aXZlbHkgbWFraW5nIGl0IGNvbnRpZ3VvdXMuCj4gQWxsb3cgZm9yIHRo YXQgc2NlbmFyaW8gYnkgdGVzdGluZyB0aGUgZW50cmllcyBpbiB0aGUgc2dfdGFibGUgZm9yCj4g Y29udGlndW91cyBjb3ZlcmFnZS4KPiAKPiBSZXZpZXdlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8 bGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29tPgo+IFNpZ25lZC1vZmYtYnk6IExpdml1 IER1ZGF1IDxsaXZpdS5kdWRhdUBhcm0uY29tPgo+IC0tLQo+IAo+IExhdXJlbnQsCj4gCj4gVGhh bmtzIGZvciB0aGUgcmV2aWV3ISBJIHdvdWxkIGxpa2UgdG8gYXNrIGZvciBvbmUgbW9yZSBmYXZv dXI6IGlmIHlvdQo+IGFyZSBPSyB3aXRoIHRoaXMgdmVyc2lvbiwgY2FuIHlvdSBwdWxsIHRoaXMg cGF0Y2ggdGhyb3VnaCB0aGUgZHJtLW1pc2MgdHJlZT8KCkkgY291bGQsIGJ1dCBJJ2QgZmlyc3Qg bmVlZCB0byBzZXQgZGltIHVwLCBhbmQgSSdtIGN1cnJlbnRseSBhYnJvYWQgd2l0aCBhIGJhZCAK aW50ZXJuZXQgY29ubmVjdGlvbiBhbmQgYSBiaWcgZGVhZGxpbmUgZm9yIHRoZSBtaWRkbGUgb2Yg bmV4dCB3ZWVrIChJIGtub3csIApsb3RzIG9mIGV4Y3VzZXMpLCBzbyBpdCdzIG5vdCB2ZXJ5IGNv bnZlbmllbnQgZm9yIG1lIGF0IHRoaXMgdGltZS4KCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fZ2Vt X2NtYV9oZWxwZXIuYyB8IDIyICsrKysrKysrKysrKysrKysrKysrLS0KPiAgaW5jbHVkZS9kcm0v ZHJtX2dlbV9jbWFfaGVscGVyLmggICAgIHwgIDQgKysrLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDIz IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuYwo+IGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW1f Y21hX2hlbHBlci5jIGluZGV4IDAyMGU3NjY4ZGZhYmEuLjQzYjE3OTIxMjA1MmQKPiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmMKPiBAQCAtNDgyLDggKzQ4MiwyNiBAQCBk cm1fZ2VtX2NtYV9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UKPiAqZGV2 LCB7Cj4gIAlzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0ICpjbWFfb2JqOwo+IAo+IC0JaWYgKHNn dC0+bmVudHMgIT0gMSkKPiAtCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKPiArCWlmIChzZ3Qt Pm5lbnRzICE9IDEpIHsKPiArCQkvKiBjaGVjayBpZiB0aGUgZW50cmllcyBpbiB0aGUgc2dfdGFi bGUgYXJlIGNvbnRpZ3VvdXMgKi8KPiArCQlkbWFfYWRkcl90IG5leHRfYWRkciA9IHNnX2RtYV9h ZGRyZXNzKHNndC0+c2dsKTsKPiArCQlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnM7Cj4gKwkJdW5zaWdu ZWQgaW50IGk7Cj4gKwo+ICsJCWZvcl9lYWNoX3NnKHNndC0+c2dsLCBzLCBzZ3QtPm5lbnRzLCBp KSB7Cj4gKwkJCS8qCj4gKwkJCSAqIHNnX2RtYV9hZGRyZXNzKHMpIGlzIG9ubHkgdmFsaWQgZm9y IGVudHJpZXMKPiArCQkJICogdGhhdCBoYXZlIHNnX2RtYV9sZW4ocykgIT0gMAo+ICsJCQkgKi8K PiArCQkJaWYgKCFzZ19kbWFfbGVuKHMpKQo+ICsJCQkJY29udGludWU7Cj4gKwo+ICsJCQlpZiAo c2dfZG1hX2FkZHJlc3MocykgIT0gbmV4dF9hZGRyKQo+ICsJCQkJcmV0dXJuIEVSUl9QVFIoLUVJ TlZBTCk7Cj4gKwo+ICsJCQluZXh0X2FkZHIgPSBzZ19kbWFfYWRkcmVzcyhzKSArIHNnX2RtYV9s ZW4ocyk7Cj4gKwkJfQo+ICsJfQo+IAo+ICAJLyogQ3JlYXRlIGEgQ01BIEdFTSBidWZmZXIuICov Cj4gIAljbWFfb2JqID0gX19kcm1fZ2VtX2NtYV9jcmVhdGUoZGV2LCBhdHRhY2gtPmRtYWJ1Zi0+ c2l6ZSk7Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9nZW1fY21hX2hlbHBlci5oCj4g Yi9pbmNsdWRlL2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaCBpbmRleCA1OGE3MzliZjE1ZjFmLi4y MTRhYTg1YWRjOGQ1Cj4gMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2dlbV9jbWFfaGVs cGVyLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaAo+IEBAIC04LDcg KzgsOSBAQAo+ICAgKiBzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0IC0gR0VNIG9iamVjdCBiYWNr ZWQgYnkgQ01BIG1lbW9yeSBhbGxvY2F0aW9ucwo+ICAgKiBAYmFzZTogYmFzZSBHRU0gb2JqZWN0 Cj4gICAqIEBwYWRkcjogcGh5c2ljYWwgYWRkcmVzcyBvZiB0aGUgYmFja2luZyBtZW1vcnkKPiAt ICogQHNndDogc2NhdHRlci9nYXRoZXIgdGFibGUgZm9yIGltcG9ydGVkIFBSSU1FIGJ1ZmZlcnMK PiArICogQHNndDogc2NhdHRlci9nYXRoZXIgdGFibGUgZm9yIGltcG9ydGVkIFBSSU1FIGJ1ZmZl cnMuIFRoZSB0YWJsZSBjYW4KPiBoYXZlICsgKiAgICAgICBtb3JlIHRoYW4gb25lIGVudHJ5IGJ1 dCB0aGV5IGFyZSBndWFyYW50ZWVkIHRvIGhhdmUKPiBjb250aWd1b3VzICsgKiAgICAgICBETUEg YWRkcmVzc2VzLgo+ICAgKiBAdmFkZHI6IGtlcm5lbCB2aXJ0dWFsIGFkZHJlc3Mgb2YgdGhlIGJh Y2tpbmcgbWVtb3J5Cj4gICAqLwo+ICBzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0IHsKCi0tIApS ZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFydAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==