From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH 2/2] drm/rockchip: unset pgoff when mmap'ing gems Date: Tue, 10 Nov 2015 13:53:44 +0800 Message-ID: <56418668.8080306@rock-chips.com> References: <4982827.0pnZflEOSR@phil> <2793929.5WVauesvFQ@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <2793929.5WVauesvFQ@phil> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNeW5tDEx5pyIMTDml6UgMDM6NTIsIEhlaWtvIFN0dWVibmVyIHdyb3RlOgo+IENvbW1p dCAzNzFmMGYwODVmNjI5ICgiQVJNOiA4NDI2LzE6IGRtYS1tYXBwaW5nOiBhZGQgbWlzc2luZyBy YW5nZSBjaGVjawo+ICAgaW4gZG1hX21tYXAoKSIpIGludHJvZHVjZWQgb2Zmc2V0LWNoZWNraW5n IGZvciBtYXBwaW5ncywgd2hpY2ggY29sbGlkZXMKPiB3aXRoIHRoZSBmYWtlLW9mZnNldCB0aGUg ZHJtIHNldHMgZm9yIGdlbXMuCj4KPiBPdGhlciBkcm0tZHJpdmVycyBzZXQgdGhpcyBvZmZzZXQg dG8gMCBiZWZvcmUgZG9pbmcgdGhlIG1hcHBpbmcsIHNvCj4gdGhpcyBsb29rcyBsaWtlIHRoZSBj b3JyZWN0IHdheSB0byBnbyBmb3Igcm9ja2NoaXAgYXMgd2VsbC4KPgo+IEZpeGVzOiAzNzFmMGYw ODVmNjI5ICgiQVJNOiA4NDI2LzE6IGRtYS1tYXBwaW5nOiBhZGQgbWlzc2luZyByYW5nZSBjaGVj ayBpbiBkbWFfbW1hcCgpIikKPiBTaWduZWQtb2ZmLWJ5OiBIZWlrbyBTdHVlYm5lciA8aGVpa29A c250ZWNoLmRlPgo+IC0tLQo+IFRoaXMgcGF0Y2ggaXMgZGVmaW5pdGx5IG5lY2Vzc2FyeSB0byBr ZWVwIHRoZSByb2NrY2hpcC1kcm0gd29ya2luZwo+IHdpdGgga2VybmVsIDQuNC4KPgo+ICAgZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9nZW0uYyB8IDEgKwo+ICAgMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JvY2tjaGlwL3JvY2tjaGlwX2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9y b2NrY2hpcF9kcm1fZ2VtLmMKPiBpbmRleCBlNTBkMTEzLi5lOWJjMTg4IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZ2VtLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2dlbS5jCj4gQEAgLTY4LDYgKzY4LDcg QEAgc3RhdGljIGludCByb2NrY2hpcF9kcm1fZ2VtX29iamVjdF9tbWFwKHN0cnVjdCBkcm1fZ2Vt X29iamVjdCAqb2JqLAo+ICAgCSAqIFZNX1BGTk1BUCBmbGFnIHRoYXQgd2FzIHNldCBieSBkcm1f Z2VtX21tYXBfb2JqKCkvZHJtX2dlbV9tbWFwKCkuCj4gICAJICovCj4gICAJdm1hLT52bV9mbGFn cyAmPSB+Vk1fUEZOTUFQOwo+ICsJdm1hLT52bV9wZ29mZiA9IDA7Cj4gICAKPiAgIAlyZXQgPSBk bWFfbW1hcF9hdHRycyhkcm0tPmRldiwgdm1hLCBya19vYmotPmt2YWRkciwgcmtfb2JqLT5kbWFf YWRkciwKPiAgIAkJCSAgICAgb2JqLT5zaXplLCAmcmtfb2JqLT5kbWFfYXR0cnMpOwpIaSBIZWlr bwogICAgICBTb3JyeSBmb3IgbWlzcyB0aGlzIHBhdGNoLCB0aGFua3MgZm9yIHRoZSBmaXguCiAg ICAgIEFja2VkLWJ5OiBNYXJrIFlhbyA8bWFyay55YW9Acm9jay1jaGlwcy5jb20+CgotLSAK77yt YXJrIFlhbwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Tue, 10 Nov 2015 13:53:44 +0800 Subject: [PATCH 2/2] drm/rockchip: unset pgoff when mmap'ing gems In-Reply-To: <2793929.5WVauesvFQ@phil> References: <4982827.0pnZflEOSR@phil> <2793929.5WVauesvFQ@phil> Message-ID: <56418668.8080306@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2015?11?10? 03:52, Heiko Stuebner wrote: > Commit 371f0f085f629 ("ARM: 8426/1: dma-mapping: add missing range check > in dma_mmap()") introduced offset-checking for mappings, which collides > with the fake-offset the drm sets for gems. > > Other drm-drivers set this offset to 0 before doing the mapping, so > this looks like the correct way to go for rockchip as well. > > Fixes: 371f0f085f629 ("ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()") > Signed-off-by: Heiko Stuebner > --- > This patch is definitly necessary to keep the rockchip-drm working > with kernel 4.4. > > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index e50d113..e9bc188 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -68,6 +68,7 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj, > * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap(). > */ > vma->vm_flags &= ~VM_PFNMAP; > + vma->vm_pgoff = 0; > > ret = dma_mmap_attrs(drm->dev, vma, rk_obj->kvaddr, rk_obj->dma_addr, > obj->size, &rk_obj->dma_attrs); Hi Heiko Sorry for miss this patch, thanks for the fix. Acked-by: Mark Yao -- ?ark Yao