From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH 2/2] drm/rockchip: unset pgoff when mmap'ing gems Date: Mon, 09 Nov 2015 20:52:43 +0100 Message-ID: <2793929.5WVauesvFQ@phil> References: <4982827.0pnZflEOSR@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <4982827.0pnZflEOSR@phil> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: linux-rockchip.vger.kernel.org Q29tbWl0IDM3MWYwZjA4NWY2MjkgKCJBUk06IDg0MjYvMTogZG1hLW1hcHBpbmc6IGFkZCBtaXNz aW5nIHJhbmdlIGNoZWNrCiBpbiBkbWFfbW1hcCgpIikgaW50cm9kdWNlZCBvZmZzZXQtY2hlY2tp bmcgZm9yIG1hcHBpbmdzLCB3aGljaCBjb2xsaWRlcwp3aXRoIHRoZSBmYWtlLW9mZnNldCB0aGUg ZHJtIHNldHMgZm9yIGdlbXMuCgpPdGhlciBkcm0tZHJpdmVycyBzZXQgdGhpcyBvZmZzZXQgdG8g MCBiZWZvcmUgZG9pbmcgdGhlIG1hcHBpbmcsIHNvCnRoaXMgbG9va3MgbGlrZSB0aGUgY29ycmVj dCB3YXkgdG8gZ28gZm9yIHJvY2tjaGlwIGFzIHdlbGwuCgpGaXhlczogMzcxZjBmMDg1ZjYyOSAo IkFSTTogODQyNi8xOiBkbWEtbWFwcGluZzogYWRkIG1pc3NpbmcgcmFuZ2UgY2hlY2sgaW4gZG1h X21tYXAoKSIpClNpZ25lZC1vZmYtYnk6IEhlaWtvIFN0dWVibmVyIDxoZWlrb0BzbnRlY2guZGU+ Ci0tLQpUaGlzIHBhdGNoIGlzIGRlZmluaXRseSBuZWNlc3NhcnkgdG8ga2VlcCB0aGUgcm9ja2No aXAtZHJtIHdvcmtpbmcKd2l0aCBrZXJuZWwgNC40LgoKIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hp cC9yb2NrY2hpcF9kcm1fZ2VtLmMgfCAxICsKIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2dlbS5jCmluZGV4IGU1 MGQxMTMuLmU5YmMxODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2Nr Y2hpcF9kcm1fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2Ry bV9nZW0uYwpAQCAtNjgsNiArNjgsNyBAQCBzdGF0aWMgaW50IHJvY2tjaGlwX2RybV9nZW1fb2Jq ZWN0X21tYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCiAJICogVk1fUEZOTUFQIGZsYWcg dGhhdCB3YXMgc2V0IGJ5IGRybV9nZW1fbW1hcF9vYmooKS9kcm1fZ2VtX21tYXAoKS4KIAkgKi8K IAl2bWEtPnZtX2ZsYWdzICY9IH5WTV9QRk5NQVA7CisJdm1hLT52bV9wZ29mZiA9IDA7CiAKIAly ZXQgPSBkbWFfbW1hcF9hdHRycyhkcm0tPmRldiwgdm1hLCBya19vYmotPmt2YWRkciwgcmtfb2Jq LT5kbWFfYWRkciwKIAkJCSAgICAgb2JqLT5zaXplLCAmcmtfb2JqLT5kbWFfYXR0cnMpOwotLSAK Mi42LjIKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Mon, 09 Nov 2015 20:52:43 +0100 Subject: [PATCH 2/2] drm/rockchip: unset pgoff when mmap'ing gems In-Reply-To: <4982827.0pnZflEOSR@phil> References: <4982827.0pnZflEOSR@phil> Message-ID: <2793929.5WVauesvFQ@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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); -- 2.6.2