From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932100AbcF3IqO (ORCPT ); Thu, 30 Jun 2016 04:46:14 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47525 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbcF3I1L (ORCPT ); Thu, 30 Jun 2016 04:27:11 -0400 X-AuditID: cbfec7f5-f792a6d000001302-56-5774d7da3b59 From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Ben Skeggs , David Airlie , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH v5 14/44] drm/nouveau: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:41 +0200 Message-id: <1467275171-6298-14-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsVy+t/xK7q3rpeEGzy6KGHRe+4kk8Wc9WvY LDbOWM9q8XJ5B6PFla/v2SxOT1jEZPH6haHF5V1z2Cy+9/WxOnB6bF6h5XFixm8Wj+3fHrB6 3O8+zuTxft9VNo++LasYPT5vkgtgj+KySUnNySxLLdK3S+DK+LTuMEvBKv6KGdsvsjUwXuHp YuTgkBAwkVh9SrSLkRPIFJO4cG89WxcjF4eQwFJGiZbpTUwQTiOTxOFd9xlBqtgEjCU2L1/C BmKLCOhKrHq+ixnEZhZYxCTxvjcGxBYWCJVYsX49WJxFQFXi0MZHbCDLeAXcJTYvEodYJidx 8thkVpAwJ1B49nd/iFUtjBLH9k1insDIu4CRYRWjaGppckFxUnqukV5xYm5xaV66XnJ+7iZG SNh93cG49JjVIUYBDkYlHl4H5pJwIdbEsuLK3EOMEhzMSiK8268AhXhTEiurUovy44tKc1KL DzFKc7AoifPO3PU+REggPbEkNTs1tSC1CCbLxMEp1cAoKODOzPIg99zRVVcqtwUa1jZLt7rr J0jde736nsOSv1UqE+rUD7zIWFms8ME27/HL9i62zMPTXpqqnVF9+pjnjrP3D/8IC+mdulud nDtLdfdZ83NekOSPnyeWNb3voHXl5RThxSFV2/j3vvhjyC4aXlz1RfPFYtFNjH32N7+f8rdM uTolsE+JpTgj0VCLuag4EQCffrY8NwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski --- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c index 6b8f2a19b2d9..a6a7fa0d7679 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c @@ -109,7 +109,7 @@ struct gk20a_instmem { u16 iommu_bit; /* Only used by DMA API */ - struct dma_attrs attrs; + unsigned long attrs; }; #define gk20a_instmem(p) container_of((p), struct gk20a_instmem, base) @@ -293,7 +293,7 @@ gk20a_instobj_dtor_dma(struct nvkm_memory *memory) goto out; dma_free_attrs(dev, node->base.mem.size << PAGE_SHIFT, node->base.vaddr, - node->handle, &imem->attrs); + node->handle, imem->attrs); out: return node; @@ -386,7 +386,7 @@ gk20a_instobj_ctor_dma(struct gk20a_instmem *imem, u32 npages, u32 align, node->base.vaddr = dma_alloc_attrs(dev, npages << PAGE_SHIFT, &node->handle, GFP_KERNEL, - &imem->attrs); + imem->attrs); if (!node->base.vaddr) { nvkm_error(subdev, "cannot allocate DMA memory\n"); return -ENOMEM; @@ -597,10 +597,9 @@ gk20a_instmem_new(struct nvkm_device *device, int index, nvkm_info(&imem->base.subdev, "using IOMMU\n"); } else { - init_dma_attrs(&imem->attrs); - dma_set_attr(DMA_ATTR_NON_CONSISTENT, &imem->attrs); - dma_set_attr(DMA_ATTR_WEAK_ORDERING, &imem->attrs); - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &imem->attrs); + imem->attrs = DMA_ATTR_NON_CONSISTENT | + DMA_ATTR_WEAK_ORDERING | + DMA_ATTR_WRITE_COMBINE; nvkm_info(&imem->base.subdev, "using DMA API\n"); } -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Krzysztof Kozlowski Subject: [PATCH v5 14/44] drm/nouveau: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:41 +0200 Message-ID: <1467275171-6298-14-git-send-email-k.kozlowski@samsung.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-reply-to: <1467275171-6298-1-git-send-email-k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Andrew Morton Cc: Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , David Airlie , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, Ben Skeggs List-Id: nouveau.vger.kernel.org U3BsaXQgb3V0IHN1YnN5c3RlbSBzcGVjaWZpYyBjaGFuZ2VzIGZvciBlYXNpZXIgcmV2aWV3cy4g VGhpcyB3aWxsIGJlCnNxdWFzaGVkIHdpdGggbWFpbiBjb21taXQuCgpTaWduZWQtb2ZmLWJ5OiBL cnp5c3p0b2YgS296bG93c2tpIDxrLmtvemxvd3NraUBzYW1zdW5nLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9pbnN0bWVtL2drMjBhLmMgfCAxMyArKysrKyst LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2luc3RtZW0v Z2syMGEuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2luc3RtZW0vZ2sy MGEuYwppbmRleCA2YjhmMmExOWIyZDkuLmE2YTdmYTBkNzY3OSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvaW5zdG1lbS9nazIwYS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2luc3RtZW0vZ2syMGEuYwpAQCAtMTA5LDcg KzEwOSw3IEBAIHN0cnVjdCBnazIwYV9pbnN0bWVtIHsKIAl1MTYgaW9tbXVfYml0OwogCiAJLyog T25seSB1c2VkIGJ5IERNQSBBUEkgKi8KLQlzdHJ1Y3QgZG1hX2F0dHJzIGF0dHJzOworCXVuc2ln bmVkIGxvbmcgYXR0cnM7CiB9OwogI2RlZmluZSBnazIwYV9pbnN0bWVtKHApIGNvbnRhaW5lcl9v ZigocCksIHN0cnVjdCBnazIwYV9pbnN0bWVtLCBiYXNlKQogCkBAIC0yOTMsNyArMjkzLDcgQEAg Z2syMGFfaW5zdG9ial9kdG9yX2RtYShzdHJ1Y3QgbnZrbV9tZW1vcnkgKm1lbW9yeSkKIAkJZ290 byBvdXQ7CiAKIAlkbWFfZnJlZV9hdHRycyhkZXYsIG5vZGUtPmJhc2UubWVtLnNpemUgPDwgUEFH RV9TSElGVCwgbm9kZS0+YmFzZS52YWRkciwKLQkJICAgICAgIG5vZGUtPmhhbmRsZSwgJmltZW0t PmF0dHJzKTsKKwkJICAgICAgIG5vZGUtPmhhbmRsZSwgaW1lbS0+YXR0cnMpOwogCiBvdXQ6CiAJ cmV0dXJuIG5vZGU7CkBAIC0zODYsNyArMzg2LDcgQEAgZ2syMGFfaW5zdG9ial9jdG9yX2RtYShz dHJ1Y3QgZ2syMGFfaW5zdG1lbSAqaW1lbSwgdTMyIG5wYWdlcywgdTMyIGFsaWduLAogCiAJbm9k ZS0+YmFzZS52YWRkciA9IGRtYV9hbGxvY19hdHRycyhkZXYsIG5wYWdlcyA8PCBQQUdFX1NISUZU LAogCQkJCQkgICAmbm9kZS0+aGFuZGxlLCBHRlBfS0VSTkVMLAotCQkJCQkgICAmaW1lbS0+YXR0 cnMpOworCQkJCQkgICBpbWVtLT5hdHRycyk7CiAJaWYgKCFub2RlLT5iYXNlLnZhZGRyKSB7CiAJ CW52a21fZXJyb3Ioc3ViZGV2LCAiY2Fubm90IGFsbG9jYXRlIERNQSBtZW1vcnlcbiIpOwogCQly ZXR1cm4gLUVOT01FTTsKQEAgLTU5NywxMCArNTk3LDkgQEAgZ2syMGFfaW5zdG1lbV9uZXcoc3Ry dWN0IG52a21fZGV2aWNlICpkZXZpY2UsIGludCBpbmRleCwKIAogCQludmttX2luZm8oJmltZW0t PmJhc2Uuc3ViZGV2LCAidXNpbmcgSU9NTVVcbiIpOwogCX0gZWxzZSB7Ci0JCWluaXRfZG1hX2F0 dHJzKCZpbWVtLT5hdHRycyk7Ci0JCWRtYV9zZXRfYXR0cihETUFfQVRUUl9OT05fQ09OU0lTVEVO VCwgJmltZW0tPmF0dHJzKTsKLQkJZG1hX3NldF9hdHRyKERNQV9BVFRSX1dFQUtfT1JERVJJTkcs ICZpbWVtLT5hdHRycyk7Ci0JCWRtYV9zZXRfYXR0cihETUFfQVRUUl9XUklURV9DT01CSU5FLCAm aW1lbS0+YXR0cnMpOworCQlpbWVtLT5hdHRycyA9IERNQV9BVFRSX05PTl9DT05TSVNURU5UIHwK KwkJCSAgICAgIERNQV9BVFRSX1dFQUtfT1JERVJJTkcgfAorCQkJICAgICAgRE1BX0FUVFJfV1JJ VEVfQ09NQklORTsKIAogCQludmttX2luZm8oJmltZW0tPmJhc2Uuc3ViZGV2LCAidXNpbmcgRE1B IEFQSVxuIik7CiAJfQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v bm91dmVhdQo=