From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757920AbdKOOl1 (ORCPT ); Wed, 15 Nov 2017 09:41:27 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:40530 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756639AbdKOOlT (ORCPT ); Wed, 15 Nov 2017 09:41:19 -0500 Date: Wed, 15 Nov 2017 14:41:17 +0000 From: Liviu Dudau To: Noralf =?utf-8?Q?Tr=C3=B8nnes?= Cc: Laurent Pinchart , David Airlie , intel-gfx@lists.freedesktop.org, LKML , DRI-devel , Mali DP Maintainers , Daniel Vetter Subject: Re: [PATCH v2] drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1 Message-ID: <20171115144117.GC31361@e110455-lin.cambridge.arm.com> References: <2213365.Z1vsgl9bDt@avalon> <20171110133310.1225-1-Liviu.Dudau@arm.com> <26071297.cMn4QuKrlS@avalon> <20171115130450.GA31361@e110455-lin.cambridge.arm.com> <14804f07-697f-cfc9-d325-6eb3888b04e3@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <14804f07-697f-cfc9-d325-6eb3888b04e3@tronnes.org> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 15, 2017 at 03:24:41PM +0100, Noralf Trønnes wrote: > > Den 15.11.2017 14.04, skrev Liviu Dudau: > > Hi, > > > > On Sat, Nov 11, 2017 at 02:47:35PM +0200, Laurent Pinchart wrote: > > > 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. > > Any other drm-misc maintainers feeling helpful and willing to take this > > patch in? > > Sure, I can do it this evening. Cheers, much appreciated! Best regards, Liviu > > Noralf. > > > Otherwise I can send it through the mali-dp tree if no one > > objects. > > > > Best regards, > > Liviu > > > > > > 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 > > > > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: Re: [PATCH v2] drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1 Date: Wed, 15 Nov 2017 14:41:17 +0000 Message-ID: <20171115144117.GC31361@e110455-lin.cambridge.arm.com> References: <2213365.Z1vsgl9bDt@avalon> <20171110133310.1225-1-Liviu.Dudau@arm.com> <26071297.cMn4QuKrlS@avalon> <20171115130450.GA31361@e110455-lin.cambridge.arm.com> <14804f07-697f-cfc9-d325-6eb3888b04e3@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <14804f07-697f-cfc9-d325-6eb3888b04e3@tronnes.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Noralf =?utf-8?Q?Tr=C3=B8nnes?= Cc: David Airlie , intel-gfx@lists.freedesktop.org, LKML , DRI-devel , Mali DP Maintainers , Laurent Pinchart , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBOb3YgMTUsIDIwMTcgYXQgMDM6MjQ6NDFQTSArMDEwMCwgTm9yYWxmIFRyw7hubmVz IHdyb3RlOgo+IAo+IERlbiAxNS4xMS4yMDE3IDE0LjA0LCBza3JldiBMaXZpdSBEdWRhdToKPiA+ IEhpLAo+ID4gCj4gPiBPbiBTYXQsIE5vdiAxMSwgMjAxNyBhdCAwMjo0NzozNVBNICswMjAwLCBM YXVyZW50IFBpbmNoYXJ0IHdyb3RlOgo+ID4gPiBIaSBMaXZpdSwKPiA+ID4gCj4gPiA+IFRoYW5r IHlvdSBmb3IgdGhlIHBhdGNoLgo+ID4gPiAKPiA+ID4gT24gRnJpZGF5LCAxMCBOb3ZlbWJlciAy MDE3IDE1OjMzOjEwIEVFVCBMaXZpdSBEdWRhdSB3cm90ZToKPiA+ID4gPiBkcm1fZ2VtX2NtYV9w cmltZV9pbXBvcnRfc2dfdGFibGUoKSB3aWxsIGZhaWwgaWYgdGhlIG51bWJlciBvZiBlbnRyaWVz Cj4gPiA+ID4gaW4gdGhlIHNnX3RhYmxlID4gMS4gSG93ZXZlciwgeW91IGNhbiBoYXZlIGEgZGV2 aWNlIHRoYXQgdXNlcyBhbiBJT01NVQo+ID4gPiA+IGVuZ2luZSBhbmQgY2FuIG1hcCBhIGRpc2Nv bnRpZ3VvdXMgYnVmZmVyIHdpdGggbXVsdGlwbGUgZW50cmllcyB0aGF0Cj4gPiA+ID4gaGF2ZSBj b25zZWN1dGl2ZSBzZ19kbWFfYWRkcmVzc2VzLCBlZmZlY3RpdmVseSBtYWtpbmcgaXQgY29udGln dW91cy4KPiA+ID4gPiBBbGxvdyBmb3IgdGhhdCBzY2VuYXJpbyBieSB0ZXN0aW5nIHRoZSBlbnRy aWVzIGluIHRoZSBzZ190YWJsZSBmb3IKPiA+ID4gPiBjb250aWd1b3VzIGNvdmVyYWdlLgo+ID4g PiA+IAo+ID4gPiA+IFJldmlld2VkLWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNo YXJ0QGlkZWFzb25ib2FyZC5jb20+Cj4gPiA+ID4gU2lnbmVkLW9mZi1ieTogTGl2aXUgRHVkYXUg PGxpdml1LmR1ZGF1QGFybS5jb20+Cj4gPiA+ID4gLS0tCj4gPiA+ID4gCj4gPiA+ID4gTGF1cmVu dCwKPiA+ID4gPiAKPiA+ID4gPiBUaGFua3MgZm9yIHRoZSByZXZpZXchIEkgd291bGQgbGlrZSB0 byBhc2sgZm9yIG9uZSBtb3JlIGZhdm91cjogaWYgeW91Cj4gPiA+ID4gYXJlIE9LIHdpdGggdGhp cyB2ZXJzaW9uLCBjYW4geW91IHB1bGwgdGhpcyBwYXRjaCB0aHJvdWdoIHRoZSBkcm0tbWlzYyB0 cmVlPwo+ID4gPiBJIGNvdWxkLCBidXQgSSdkIGZpcnN0IG5lZWQgdG8gc2V0IGRpbSB1cCwgYW5k IEknbSBjdXJyZW50bHkgYWJyb2FkIHdpdGggYSBiYWQKPiA+ID4gaW50ZXJuZXQgY29ubmVjdGlv biBhbmQgYSBiaWcgZGVhZGxpbmUgZm9yIHRoZSBtaWRkbGUgb2YgbmV4dCB3ZWVrIChJIGtub3cs Cj4gPiA+IGxvdHMgb2YgZXhjdXNlcyksIHNvIGl0J3Mgbm90IHZlcnkgY29udmVuaWVudCBmb3Ig bWUgYXQgdGhpcyB0aW1lLgo+ID4gQW55IG90aGVyIGRybS1taXNjIG1haW50YWluZXJzIGZlZWxp bmcgaGVscGZ1bCBhbmQgd2lsbGluZyB0byB0YWtlIHRoaXMKPiA+IHBhdGNoIGluPwo+IAo+IFN1 cmUsIEkgY2FuIGRvIGl0IHRoaXMgZXZlbmluZy4KCkNoZWVycywgbXVjaCBhcHByZWNpYXRlZCEK CkJlc3QgcmVnYXJkcywKTGl2aXUKCj4gCj4gTm9yYWxmLgo+IAo+ID4gICBPdGhlcndpc2UgSSBj YW4gc2VuZCBpdCB0aHJvdWdoIHRoZSBtYWxpLWRwIHRyZWUgaWYgbm8gb25lCj4gPiBvYmplY3Rz Lgo+ID4gCj4gPiBCZXN0IHJlZ2FyZHMsCj4gPiBMaXZpdQo+ID4gCj4gPiA+ID4gICBkcml2ZXJz L2dwdS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmMgfCAyMiArKysrKysrKysrKysrKysrKysrKy0t Cj4gPiA+ID4gICBpbmNsdWRlL2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaCAgICAgfCAgNCArKyst Cj4gPiA+ID4gICAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCj4gPiA+ID4gCj4gPiA+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2Vt X2NtYV9oZWxwZXIuYwo+ID4gPiA+IGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW1fY21hX2hlbHBl ci5jIGluZGV4IDAyMGU3NjY4ZGZhYmEuLjQzYjE3OTIxMjA1MmQKPiA+ID4gPiAxMDA2NDQKPiA+ ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmMKPiA+ID4gPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmMKPiA+ID4gPiBAQCAtNDgy LDggKzQ4MiwyNiBAQCBkcm1fZ2VtX2NtYV9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRy bV9kZXZpY2UKPiA+ID4gPiAqZGV2LCB7Cj4gPiA+ID4gICAJc3RydWN0IGRybV9nZW1fY21hX29i amVjdCAqY21hX29iajsKPiA+ID4gPiAKPiA+ID4gPiAtCWlmIChzZ3QtPm5lbnRzICE9IDEpCj4g PiA+ID4gLQkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7Cj4gPiA+ID4gKwlpZiAoc2d0LT5uZW50 cyAhPSAxKSB7Cj4gPiA+ID4gKwkJLyogY2hlY2sgaWYgdGhlIGVudHJpZXMgaW4gdGhlIHNnX3Rh YmxlIGFyZSBjb250aWd1b3VzICovCj4gPiA+ID4gKwkJZG1hX2FkZHJfdCBuZXh0X2FkZHIgPSBz Z19kbWFfYWRkcmVzcyhzZ3QtPnNnbCk7Cj4gPiA+ID4gKwkJc3RydWN0IHNjYXR0ZXJsaXN0ICpz Owo+ID4gPiA+ICsJCXVuc2lnbmVkIGludCBpOwo+ID4gPiA+ICsKPiA+ID4gPiArCQlmb3JfZWFj aF9zZyhzZ3QtPnNnbCwgcywgc2d0LT5uZW50cywgaSkgewo+ID4gPiA+ICsJCQkvKgo+ID4gPiA+ ICsJCQkgKiBzZ19kbWFfYWRkcmVzcyhzKSBpcyBvbmx5IHZhbGlkIGZvciBlbnRyaWVzCj4gPiA+ ID4gKwkJCSAqIHRoYXQgaGF2ZSBzZ19kbWFfbGVuKHMpICE9IDAKPiA+ID4gPiArCQkJICovCj4g PiA+ID4gKwkJCWlmICghc2dfZG1hX2xlbihzKSkKPiA+ID4gPiArCQkJCWNvbnRpbnVlOwo+ID4g PiA+ICsKPiA+ID4gPiArCQkJaWYgKHNnX2RtYV9hZGRyZXNzKHMpICE9IG5leHRfYWRkcikKPiA+ ID4gPiArCQkJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwo+ID4gPiA+ICsKPiA+ID4gPiArCQkJ bmV4dF9hZGRyID0gc2dfZG1hX2FkZHJlc3MocykgKyBzZ19kbWFfbGVuKHMpOwo+ID4gPiA+ICsJ CX0KPiA+ID4gPiArCX0KPiA+ID4gPiAKPiA+ID4gPiAgIAkvKiBDcmVhdGUgYSBDTUEgR0VNIGJ1 ZmZlci4gKi8KPiA+ID4gPiAgIAljbWFfb2JqID0gX19kcm1fZ2VtX2NtYV9jcmVhdGUoZGV2LCBh dHRhY2gtPmRtYWJ1Zi0+c2l6ZSk7Cj4gPiA+ID4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2Ry bV9nZW1fY21hX2hlbHBlci5oCj4gPiA+ID4gYi9pbmNsdWRlL2RybS9kcm1fZ2VtX2NtYV9oZWxw ZXIuaCBpbmRleCA1OGE3MzliZjE1ZjFmLi4yMTRhYTg1YWRjOGQ1Cj4gPiA+ID4gMTAwNjQ0Cj4g PiA+ID4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2dlbV9jbWFfaGVscGVyLmgKPiA+ID4gPiArKysg Yi9pbmNsdWRlL2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaAo+ID4gPiA+IEBAIC04LDcgKzgsOSBA QAo+ID4gPiA+ICAgICogc3RydWN0IGRybV9nZW1fY21hX29iamVjdCAtIEdFTSBvYmplY3QgYmFj a2VkIGJ5IENNQSBtZW1vcnkgYWxsb2NhdGlvbnMKPiA+ID4gPiAgICAqIEBiYXNlOiBiYXNlIEdF TSBvYmplY3QKPiA+ID4gPiAgICAqIEBwYWRkcjogcGh5c2ljYWwgYWRkcmVzcyBvZiB0aGUgYmFj a2luZyBtZW1vcnkKPiA+ID4gPiAtICogQHNndDogc2NhdHRlci9nYXRoZXIgdGFibGUgZm9yIGlt cG9ydGVkIFBSSU1FIGJ1ZmZlcnMKPiA+ID4gPiArICogQHNndDogc2NhdHRlci9nYXRoZXIgdGFi bGUgZm9yIGltcG9ydGVkIFBSSU1FIGJ1ZmZlcnMuIFRoZSB0YWJsZSBjYW4KPiA+ID4gPiBoYXZl ICsgKiAgICAgICBtb3JlIHRoYW4gb25lIGVudHJ5IGJ1dCB0aGV5IGFyZSBndWFyYW50ZWVkIHRv IGhhdmUKPiA+ID4gPiBjb250aWd1b3VzICsgKiAgICAgICBETUEgYWRkcmVzc2VzLgo+ID4gPiA+ ICAgICogQHZhZGRyOiBrZXJuZWwgdmlydHVhbCBhZGRyZXNzIG9mIHRoZSBiYWNraW5nIG1lbW9y eQo+ID4gPiA+ICAgICovCj4gPiA+ID4gICBzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0IHsKPiA+ ID4gLS0gCj4gPiA+IFJlZ2FyZHMsCj4gPiA+IAo+ID4gPiBMYXVyZW50IFBpbmNoYXJ0Cj4gPiA+ IAo+IAoKLS0gCj09PT09PT09PT09PT09PT09PT09CnwgSSB3b3VsZCBsaWtlIHRvIHwKfCBmaXgg dGhlIHdvcmxkLCAgfAp8IGJ1dCB0aGV5J3JlIG5vdCB8CnwgZ2l2aW5nIG1lIHRoZSAgIHwKIFwg c291cmNlIGNvZGUhICAvCiAgLS0tLS0tLS0tLS0tLS0tCiAgICDCr1xfKOODhClfL8KvCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=