From mboxrd@z Thu Jan 1 00:00:00 1970 From: Krzysztof Kozlowski Subject: [PATCH v5 13/44] drm/msm: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:40 +0200 Message-ID: <1467275171-6298-13-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: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Andrew Morton Cc: Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , David Airlie , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, Rob Clark , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org U3BsaXQgb3V0IHN1YnN5c3RlbSBzcGVjaWZpYyBjaGFuZ2VzIGZvciBlYXNpZXIgcmV2aWV3cy4g VGhpcyB3aWxsIGJlCnNxdWFzaGVkIHdpdGggbWFpbiBjb21taXQuCgpTaWduZWQtb2ZmLWJ5OiBL cnp5c3p0b2YgS296bG93c2tpIDxrLmtvemxvd3NraUBzYW1zdW5nLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9kcnYuYyB8IDEzICsrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL21zbS9tc21fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYwppbmRl eCA5YzY1NDA5MmVmNzguLjQwZGVmMzUwMzBkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21zbS9tc21fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKQEAgLTIz MCwxMSArMjMwLDEwIEBAIHN0YXRpYyBpbnQgbXNtX2RybV91bmluaXQoc3RydWN0IGRldmljZSAq ZGV2KQogCX0KIAogCWlmIChwcml2LT52cmFtLnBhZGRyKSB7Ci0JCURFRklORV9ETUFfQVRUUlMo YXR0cnMpOwotCQlkbWFfc2V0X2F0dHIoRE1BX0FUVFJfTk9fS0VSTkVMX01BUFBJTkcsICZhdHRy cyk7CisJCXVuc2lnbmVkIGxvbmcgYXR0cnMgPSBETUFfQVRUUl9OT19LRVJORUxfTUFQUElORzsK IAkJZHJtX21tX3Rha2Vkb3duKCZwcml2LT52cmFtLm1tKTsKIAkJZG1hX2ZyZWVfYXR0cnMoZGV2 LCBwcml2LT52cmFtLnNpemUsIE5VTEwsCi0JCQkgICAgICAgcHJpdi0+dnJhbS5wYWRkciwgJmF0 dHJzKTsKKwkJCSAgICAgICBwcml2LT52cmFtLnBhZGRyLCBhdHRycyk7CiAJfQogCiAJY29tcG9u ZW50X3VuYmluZF9hbGwoZGV2LCBkZGV2KTsKQEAgLTI5OSwyMSArMjk4LDIxIEBAIHN0YXRpYyBp bnQgbXNtX2luaXRfdnJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWlmIChzaXpl KSB7Ci0JCURFRklORV9ETUFfQVRUUlMoYXR0cnMpOworCQl1bnNpZ25lZCBsb25nIGF0dHJzID0g MDsKIAkJdm9pZCAqcDsKIAogCQlwcml2LT52cmFtLnNpemUgPSBzaXplOwogCiAJCWRybV9tbV9p bml0KCZwcml2LT52cmFtLm1tLCAwLCAoc2l6ZSA+PiBQQUdFX1NISUZUKSAtIDEpOwogCi0JCWRt YV9zZXRfYXR0cihETUFfQVRUUl9OT19LRVJORUxfTUFQUElORywgJmF0dHJzKTsKLQkJZG1hX3Nl dF9hdHRyKERNQV9BVFRSX1dSSVRFX0NPTUJJTkUsICZhdHRycyk7CisJCWF0dHJzIHw9IERNQV9B VFRSX05PX0tFUk5FTF9NQVBQSU5HOworCQlhdHRycyB8PSBETUFfQVRUUl9XUklURV9DT01CSU5F OwogCiAJCS8qIG5vdGUgdGhhdCBmb3Igbm8ta2VybmVsLW1hcHBpbmcsIHRoZSB2YWRkciByZXR1 cm5lZAogCQkgKiBpcyBib2d1cywgYnV0IG5vbi1udWxsIGlmIGFsbG9jYXRpb24gc3VjY2VlZGVk OgogCQkgKi8KIAkJcCA9IGRtYV9hbGxvY19hdHRycyhkZXYtPmRldiwgc2l6ZSwKLQkJCQkmcHJp di0+dnJhbS5wYWRkciwgR0ZQX0tFUk5FTCwgJmF0dHJzKTsKKwkJCQkmcHJpdi0+dnJhbS5wYWRk ciwgR0ZQX0tFUk5FTCwgYXR0cnMpOwogCQlpZiAoIXApIHsKIAkJCWRldl9lcnIoZGV2LT5kZXYs ICJmYWlsZWQgdG8gYWxsb2NhdGUgVlJBTVxuIik7CiAJCQlwcml2LT52cmFtLnBhZGRyID0gMDsK LS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123AbcF3I1P (ORCPT ); Thu, 30 Jun 2016 04:27:15 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:19123 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbcF3I1I (ORCPT ); Thu, 30 Jun 2016 04:27:08 -0400 X-AuditID: cbfec7f5-f792a6d000001302-52-5774d7d9ba4d From: Krzysztof Kozlowski To: Andrew Morton Cc: linux-kernel@vger.kernel.org, hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Rob Clark , David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v5 13/44] drm/msm: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 10:25:40 +0200 Message-id: <1467275171-6298-13-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+NgFlrNLMWRmVeSWpSXmKPExsVy+t/xK7o3r5eEG6xZaWrRe+4kk8Wc9WvY LDbOWM9qceXrezaLOc/PMlqcnrCIyeL1C0OLifvPsltc3jWHzeL5wh/MDlweO2fdZffYvELL 48SM3ywe2789YPW4332cyaNvyypGj8+b5ALYo7hsUlJzMstSi/TtErgyfr3sYCnYzlvxdbVY A+N7ri5GTg4JAROJZdtOMEPYYhIX7q1n62Lk4hASWMoo0TP5ESuE08gkcW9CHxNIFZuAscTm 5UvYQGwRAV2JVc93MYMUMQscZZL4vv0LO0hCWMBf4tzUKWBFLAKqEvuvT2IEsXkF3CWede1i h1gnJ3Hy2GSgDRwcnEDx2d/9IZa1MEoc2zeJeQIj7wJGhlWMoqmlyQXFSem5RnrFibnFpXnp esn5uZsYIUH4dQfj0mNWhxgFOBiVeHgdmEvChVgTy4orcw8xSnAwK4nwbr8CFOJNSaysSi3K jy8qzUktPsQozcGiJM47c9f7ECGB9MSS1OzU1ILUIpgsEwenVAOjZGSqmIJj8YOAywn3gmz7 nxedenXhWbZKfMuZAGXuI8dLzb3aTWM7DsyOrO2Z4DzjuoXh7aCTzT8b7grtcLz+6mTNi3/d 5425dN/tmGN161eLYUyq3IZNwb/mfllolZ2/dG8E3/cNt2VM9A+9UlyyLufRry2sV2LuzNnY sTtMLsnYc5Epx5ufSizFGYmGWsxFxYkA4RHHlT4CAAA= 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/msm/msm_drv.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 9c654092ef78..40def35030d6 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -230,11 +230,10 @@ static int msm_drm_uninit(struct device *dev) } if (priv->vram.paddr) { - DEFINE_DMA_ATTRS(attrs); - dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); + unsigned long attrs = DMA_ATTR_NO_KERNEL_MAPPING; drm_mm_takedown(&priv->vram.mm); dma_free_attrs(dev, priv->vram.size, NULL, - priv->vram.paddr, &attrs); + priv->vram.paddr, attrs); } component_unbind_all(dev, ddev); @@ -299,21 +298,21 @@ static int msm_init_vram(struct drm_device *dev) } if (size) { - DEFINE_DMA_ATTRS(attrs); + unsigned long attrs = 0; void *p; priv->vram.size = size; drm_mm_init(&priv->vram.mm, 0, (size >> PAGE_SHIFT) - 1); - dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); + attrs |= DMA_ATTR_NO_KERNEL_MAPPING; + attrs |= DMA_ATTR_WRITE_COMBINE; /* note that for no-kernel-mapping, the vaddr returned * is bogus, but non-null if allocation succeeded: */ p = dma_alloc_attrs(dev->dev, size, - &priv->vram.paddr, GFP_KERNEL, &attrs); + &priv->vram.paddr, GFP_KERNEL, attrs); if (!p) { dev_err(dev->dev, "failed to allocate VRAM\n"); priv->vram.paddr = 0; -- 1.9.1