From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161079AbcFJKYS (ORCPT ); Fri, 10 Jun 2016 06:24:18 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12642 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932459AbcFJKMt (ORCPT ); Fri, 10 Jun 2016 06:12:49 -0400 X-AuditID: cbfec7f5-f792a6d000001302-da-575a929f7a8f From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , David Airlie , Matthias Brugger , Philipp Zabel , Daniel Vetter , CK Hu , Arnd Bergmann , YT Shen , Mao Huang , Daniel Kurtz , Bibby Hsieh , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 12/44] drm/mediatek: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:29 +0200 Message-id: <1465553521-27303-13-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> References: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsVy+t/xa7rzJ0WFG+x8YmHRe+4kk8Wc9WvY LP5OOsZusXHGelaLmRtmsFg07t7GbrHw4V1mi8YZ81ktrnx9z2ZxesIiJovXLwwtNj2+xmpx edccNovLzRcZLc5ddrRoajG2uHvvBIvF3Tt9bA5CHr9/TWL0mN1wkcVj77cFLB47Z91l99i8 QsvjxIzfLB7bvz1g9bjffZzJY/OSeo+Wk/tZPPr/Gnj0bVnF6PF5k1wAbxSXTUpqTmZZapG+ XQJXxqVtXWwFB0UrGvc9Y2xg/CjYxcjJISFgIrFi3gxWCFtM4sK99WxdjFwcQgJLGSUWLFrC BOE0Mkm829DGCFLFJmAssXn5EjYQW0RAV2LV813MIEXMAn9ZJKYfvgqWEBYIk7jQ3QQ2lkVA VeJfx3t2EJtXwENi7ddvjBDr5CROHpsMVsMJFO++O5MFxBYScJfY/uQV0wRG3gWMDKsYRVNL kwuKk9JzjfSKE3OLS/PS9ZLzczcxQmLh6w7GpcesDjEKcDAq8fBG7IoMF2JNLCuuzD3EKMHB rCTCa9EXFS7Em5JYWZValB9fVJqTWnyIUZqDRUmcd+au9yFCAumJJanZqakFqUUwWSYOTqkG Rrm+D+faXC6YzdG/WzmV18dzZlNNjYRtgcmT+RMOrDyx/cGz0BtfHSs2OoqciVjzVmrWbxef MMPpy0tt3i7w6TMyuP0ly865QIdlVSyf19zYn1LBl9/9d2Q4HjFHtePn/U9a8tvC5C4VcHql r9cWyLU4rNLEe7PG531k5sMjBWG+0sa/L6frKbEUZyQaajEXFScCAEAaQbSBAgAA 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/mediatek/mtk_drm_gem.c | 13 ++++++------- drivers/gpu/drm/mediatek/mtk_drm_gem.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index fa2ec0cd00e8..7abc550ebc00 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -54,15 +54,14 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev, obj = &mtk_gem->base; - init_dma_attrs(&mtk_gem->dma_attrs); - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &mtk_gem->dma_attrs); + mtk_gem->dma_attrs = DMA_ATTR_WRITE_COMBINE; if (!alloc_kmap) - dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &mtk_gem->dma_attrs); + mtk_gem->dma_attrs |= DMA_ATTR_NO_KERNEL_MAPPING; mtk_gem->cookie = dma_alloc_attrs(priv->dma_dev, obj->size, &mtk_gem->dma_addr, GFP_KERNEL, - &mtk_gem->dma_attrs); + mtk_gem->dma_attrs); if (!mtk_gem->cookie) { DRM_ERROR("failed to allocate %zx byte dma buffer", obj->size); ret = -ENOMEM; @@ -93,7 +92,7 @@ void mtk_drm_gem_free_object(struct drm_gem_object *obj) drm_prime_gem_destroy(obj, mtk_gem->sg); else dma_free_attrs(priv->dma_dev, obj->size, mtk_gem->cookie, - mtk_gem->dma_addr, &mtk_gem->dma_attrs); + mtk_gem->dma_addr, mtk_gem->dma_attrs); /* release file pointer to gem object. */ drm_gem_object_release(obj); @@ -173,7 +172,7 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, vma->vm_pgoff = 0; ret = dma_mmap_attrs(priv->dma_dev, vma, mtk_gem->cookie, - mtk_gem->dma_addr, obj->size, &mtk_gem->dma_attrs); + mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs); if (ret) drm_gem_vm_close(vma); @@ -224,7 +223,7 @@ struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj) ret = dma_get_sgtable_attrs(priv->dma_dev, sgt, mtk_gem->cookie, mtk_gem->dma_addr, obj->size, - &mtk_gem->dma_attrs); + mtk_gem->dma_attrs); if (ret) { DRM_ERROR("failed to allocate sgt, %d\n", ret); kfree(sgt); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/mediatek/mtk_drm_gem.h index 3a2a5624a1cb..2752718fa5b2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.h @@ -35,7 +35,7 @@ struct mtk_drm_gem_obj { void *cookie; void *kvaddr; dma_addr_t dma_addr; - struct dma_attrs dma_attrs; + unsigned long dma_attrs; struct sg_table *sg; }; -- 1.9.1