From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/fb_cma_helper: Implement fb_mmap callback Date: Tue, 7 Jun 2016 16:43:05 +0200 Message-ID: <20160607144305.GC3363@phenom.ffwll.local> References: <8fd95ac1440e0f01daad6d4380be3a4c8fa61055.1465301219.git.robin.murphy@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CA1C6E7B5 for ; Tue, 7 Jun 2016 14:43:10 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m124so23677211wme.3 for ; Tue, 07 Jun 2016 07:43:10 -0700 (PDT) Content-Disposition: inline In-Reply-To: <8fd95ac1440e0f01daad6d4380be3a4c8fa61055.1465301219.git.robin.murphy@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Robin Murphy Cc: daniel.vetter@ffwll.ch, liviu.dudau@arm.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKdW4gMDcsIDIwMTYgYXQgMDE6MTg6MDlQTSArMDEwMCwgUm9iaW4gTXVycGh5IHdy b3RlOgo+IEluIHRoZSBhYnNlbmNlIG9mIGFuIGZiX21tYXAgY2FsbGJhY2ssIHRoZSBmYmRldiBj b2RlIGZhbGxzIGJhY2sgdG8gYQo+IG5haXZlIGltcGxlbWVudGF0aW9uIHdoaWNoIHJlbGllcyB1 cG9uIHRoZSBETUEgYWRkcmVzcyBiZWluZyB0aGUgc2FtZQo+IGFzIHRoZSBwaHlzaWNhbCBhZGRy ZXNzLCBhbmQgdGhlIGJ1ZmZlciBiZWluZyBwaHlzaWNhbGx5IGNvbnRpZ3VvdXMKPiBmcm9tIHRo ZXJlLiBXaGlsc3QgdGhpcyBvZnRlbiBob2xkcyBmb3Igc3RhbmRhcmQgQ01BIGFsbG9jYXRpb25z IHZpYQo+IHRoZSBwbGF0Zm9ybSdzIHJlZ3VsYXIgRE1BIG9wcywgaWYgdGhlIGFsbG9jYXRpb24g aXMgcHJvdmlkZWQgYnkgYW4KPiBJT01NVSB0aGVuIHN1Y2ggYXNzdW1wdGlvbnMgY2FuIGZhbGwg YXBhcnQgc3BlY3RhY3VsYXJseS4KPiAKPiBUbyByZXNvbHZlIHRoaXMsIHJlcm91dGUgdGhlIGZi X21tYXAgY2FsbCB0byB0aGUgYXBwcm9wcmlhdGUgRE1BIEFQSQo+IGltcGxlbWVudGF0aW9uLCBh cyBwZXIgdGhlIG90aGVyIGNtYV9oZWxwZXIgY2FsbHMuCj4gCj4gQWNrZWQtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4gU2lnbmVkLW9mZi1ieTogUm9iaW4gTXVy cGh5IDxyb2Jpbi5tdXJwaHlAYXJtLmNvbT4KPiAtLS0KPiAKPiBSZXNlbmRpbmcgcmViYXNlZCB0 byA0LjctcmMxIHdpdGggRGFuaWVsJ3MgYWNrLiBJIGtub3cgUnVzc2VsbCByYWlzZWQKPiBzb21l IGNvbmNlcm5zIGFib3V0IHRoZSBnZW5lcmFsIHdheSBmYl9jbWFfaGVscGVyIHVzZXMgZmJfaW5m b1sxXSwgYnV0Cj4gQUZBSUNTIHRoYXQncyBhIGxvbmdzdGFuZGluZyBzZXBhcmF0ZSBwcm9ibGVt IG9ydGhvZ29uYWwgdG8gdGhpcyBwYXRjaC4KCkRvIHlvdSB3YW50IG1lIHRvIHB1bGwgdGhpcyBp biB0aHJvdWdoIGRybS1taXNjLCBvciB3aWxsIHRoaXMgbGFuZCB0aHJvdWdoCnNvbWUgZHJpdmVy IHRyZWU/IE5vdGUgdGhhdCBJJ2xsIGRvIC1taXNjIHB1bGxzIGFib3V0IGV2ZXJ5IHdlZWssIHNv IGlmCnlvdSBkb24ndCBzZW5kIHlvdXIgcHVsbCB0aGlzIHdlZWsgSSdkIGxpa2UgdG8gcHVsbCBp dCBpbiB0byBhdm9pZApoaWxhcml0eV5XIG5lZWRsZXNzIGNvbmZsaWN0cy4KLURhbmllbAoKPiAK PiBSb2Jpbi4KPiAKPiBbMV06aHR0cDovL3RocmVhZC5nbWFuZS5vcmcvZ21hbmUuY29tcC52aWRl by5kcmkuZGV2ZWwvMTQ5Mjg4Cj4gCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hlbHBl ci5jIHwgOCArKysrKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspCj4gCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hlbHBlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9mYl9jbWFfaGVscGVyLmMKPiBpbmRleCAxNzJjYWZlMTFjNzEuLmEyNWFm YzA2OGQzZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2NtYV9oZWxwZXIu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hlbHBlci5jCj4gQEAgLTIzLDYg KzIzLDcgQEAKPiAgI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19oZWxwZXIuaD4KPiAgI2luY2x1ZGUg PGRybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaD4KPiAgI2luY2x1ZGUgPGRybS9kcm1fZmJfY21hX2hl bHBlci5oPgo+ICsjaW5jbHVkZSA8bGludXgvZG1hLW1hcHBpbmcuaD4KPiAgI2luY2x1ZGUgPGxp bnV4L21vZHVsZS5oPgo+ICAKPiAgI2RlZmluZSBERUZBVUxUX0ZCREVGSU9fREVMQVlfTVMgNTAK PiBAQCAtMjk3LDYgKzI5OCwxMiBAQCBpbnQgZHJtX2ZiX2NtYV9kZWJ1Z2ZzX3Nob3coc3RydWN0 IHNlcV9maWxlICptLCB2b2lkICphcmcpCj4gIEVYUE9SVF9TWU1CT0xfR1BMKGRybV9mYl9jbWFf ZGVidWdmc19zaG93KTsKPiAgI2VuZGlmCj4gIAo+ICtzdGF0aWMgaW50IGRybV9mYl9jbWFfbW1h cChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpCj4gK3sK PiArCXJldHVybiBkbWFfbW1hcF93cml0ZWNvbWJpbmUoaW5mby0+ZGV2aWNlLCB2bWEsIGluZm8t PnNjcmVlbl9iYXNlLAo+ICsJCQkJICAgICBpbmZvLT5maXguc21lbV9zdGFydCwgaW5mby0+Zml4 LnNtZW1fbGVuKTsKPiArfQo+ICsKPiAgc3RhdGljIHN0cnVjdCBmYl9vcHMgZHJtX2ZiZGV2X2Nt YV9vcHMgPSB7Cj4gIAkub3duZXIJCT0gVEhJU19NT0RVTEUsCj4gIAkuZmJfZmlsbHJlY3QJPSBk cm1fZmJfaGVscGVyX3N5c19maWxscmVjdCwKPiBAQCAtMzA3LDYgKzMxNCw3IEBAIHN0YXRpYyBz dHJ1Y3QgZmJfb3BzIGRybV9mYmRldl9jbWFfb3BzID0gewo+ICAJLmZiX2JsYW5rCT0gZHJtX2Zi X2hlbHBlcl9ibGFuaywKPiAgCS5mYl9wYW5fZGlzcGxheQk9IGRybV9mYl9oZWxwZXJfcGFuX2Rp c3BsYXksCj4gIAkuZmJfc2V0Y21hcAk9IGRybV9mYl9oZWxwZXJfc2V0Y21hcCwKPiArCS5mYl9t bWFwCT0gZHJtX2ZiX2NtYV9tbWFwLAo+ICB9Owo+ICAKPiAgc3RhdGljIGludCBkcm1fZmJkZXZf Y21hX2RlZmVycmVkX2lvX21tYXAoc3RydWN0IGZiX2luZm8gKmluZm8sCj4gLS0gCj4gMi44LjEu ZGlydHkKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755575AbcFGOnM (ORCPT ); Tue, 7 Jun 2016 10:43:12 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35701 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260AbcFGOnJ (ORCPT ); Tue, 7 Jun 2016 10:43:09 -0400 Date: Tue, 7 Jun 2016 16:43:05 +0200 From: Daniel Vetter To: Robin Murphy Cc: airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, daniel.vetter@ffwll.ch, liviu.dudau@arm.com Subject: Re: [PATCH] drm/fb_cma_helper: Implement fb_mmap callback Message-ID: <20160607144305.GC3363@phenom.ffwll.local> Mail-Followup-To: Robin Murphy , airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, liviu.dudau@arm.com References: <8fd95ac1440e0f01daad6d4380be3a4c8fa61055.1465301219.git.robin.murphy@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8fd95ac1440e0f01daad6d4380be3a4c8fa61055.1465301219.git.robin.murphy@arm.com> X-Operating-System: Linux phenom 4.6.0-rc5+ User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 07, 2016 at 01:18:09PM +0100, Robin Murphy wrote: > In the absence of an fb_mmap callback, the fbdev code falls back to a > naive implementation which relies upon the DMA address being the same > as the physical address, and the buffer being physically contiguous > from there. Whilst this often holds for standard CMA allocations via > the platform's regular DMA ops, if the allocation is provided by an > IOMMU then such assumptions can fall apart spectacularly. > > To resolve this, reroute the fb_mmap call to the appropriate DMA API > implementation, as per the other cma_helper calls. > > Acked-by: Daniel Vetter > Signed-off-by: Robin Murphy > --- > > Resending rebased to 4.7-rc1 with Daniel's ack. I know Russell raised > some concerns about the general way fb_cma_helper uses fb_info[1], but > AFAICS that's a longstanding separate problem orthogonal to this patch. Do you want me to pull this in through drm-misc, or will this land through some driver tree? Note that I'll do -misc pulls about every week, so if you don't send your pull this week I'd like to pull it in to avoid hilarity^W needless conflicts. -Daniel > > Robin. > > [1]:http://thread.gmane.org/gmane.comp.video.dri.devel/149288 > > drivers/gpu/drm/drm_fb_cma_helper.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c > index 172cafe11c71..a25afc068d3f 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > #include > > #define DEFAULT_FBDEFIO_DELAY_MS 50 > @@ -297,6 +298,12 @@ int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg) > EXPORT_SYMBOL_GPL(drm_fb_cma_debugfs_show); > #endif > > +static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma) > +{ > + return dma_mmap_writecombine(info->device, vma, info->screen_base, > + info->fix.smem_start, info->fix.smem_len); > +} > + > static struct fb_ops drm_fbdev_cma_ops = { > .owner = THIS_MODULE, > .fb_fillrect = drm_fb_helper_sys_fillrect, > @@ -307,6 +314,7 @@ static struct fb_ops drm_fbdev_cma_ops = { > .fb_blank = drm_fb_helper_blank, > .fb_pan_display = drm_fb_helper_pan_display, > .fb_setcmap = drm_fb_helper_setcmap, > + .fb_mmap = drm_fb_cma_mmap, > }; > > static int drm_fbdev_cma_deferred_io_mmap(struct fb_info *info, > -- > 2.8.1.dirty > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch