From: Krzysztof Kozlowski <k.kozlowski@samsung.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: hch@infradead.org, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Tomi Valkeinen <tomi.valkeinen@ti.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Oleg Nesterov <oleg@redhat.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 22/44] video: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:39 +0200 [thread overview] Message-ID: <1465553521-27303-23-git-send-email-k.kozlowski@samsung.com> (raw) In-Reply-To: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 12 ++++++------ drivers/video/fbdev/omap2/omapfb/omapfb.h | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c index d3af01c94a58..59172a2185c0 100644 --- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c +++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c @@ -1332,7 +1332,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi) } dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle, - &rg->attrs); + rg->attrs); rg->token = NULL; rg->vaddr = NULL; @@ -1370,7 +1370,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, struct omapfb2_device *fbdev = ofbi->fbdev; struct omapfb2_mem_region *rg; void *token; - DEFINE_DMA_ATTRS(attrs); + unsigned long attrs; dma_addr_t dma_handle; int r; @@ -1386,15 +1386,15 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, size = PAGE_ALIGN(size); - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); + attrs = DMA_ATTR_WRITE_COMBINE; if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) - dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); + attrs |= DMA_ATTR_NO_KERNEL_MAPPING; DBG("allocating %lu bytes for fb %d\n", size, ofbi->id); token = dma_alloc_attrs(fbdev->dev, size, &dma_handle, - GFP_KERNEL, &attrs); + GFP_KERNEL, attrs); if (token == NULL) { dev_err(fbdev->dev, "failed to allocate framebuffer\n"); @@ -1408,7 +1408,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, r = omap_vrfb_request_ctx(&rg->vrfb); if (r) { dma_free_attrs(fbdev->dev, size, token, dma_handle, - &attrs); + attrs); dev_err(fbdev->dev, "vrfb create ctx failed\n"); return r; } diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb.h b/drivers/video/fbdev/omap2/omapfb/omapfb.h index 623cd872a367..8aaa2f643820 100644 --- a/drivers/video/fbdev/omap2/omapfb/omapfb.h +++ b/drivers/video/fbdev/omap2/omapfb/omapfb.h @@ -28,7 +28,6 @@ #endif #include <linux/rwsem.h> -#include <linux/dma-attrs.h> #include <linux/dma-mapping.h> #include <video/omapdss.h> @@ -51,7 +50,7 @@ extern bool omapfb_debug; struct omapfb2_mem_region { int id; - struct dma_attrs attrs; + unsigned long attrs; void *token; dma_addr_t dma_handle; u32 paddr; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <k.kozlowski@samsung.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: hch@infradead.org, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Tomi Valkeinen <tomi.valkeinen@ti.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Oleg Nesterov <oleg@redhat.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 22/44] video: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 10:11:39 +0000 [thread overview] Message-ID: <1465553521-27303-23-git-send-email-k.kozlowski@samsung.com> (raw) In-Reply-To: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 12 ++++++------ drivers/video/fbdev/omap2/omapfb/omapfb.h | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c index d3af01c94a58..59172a2185c0 100644 --- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c +++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c @@ -1332,7 +1332,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi) } dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle, - &rg->attrs); + rg->attrs); rg->token = NULL; rg->vaddr = NULL; @@ -1370,7 +1370,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, struct omapfb2_device *fbdev = ofbi->fbdev; struct omapfb2_mem_region *rg; void *token; - DEFINE_DMA_ATTRS(attrs); + unsigned long attrs; dma_addr_t dma_handle; int r; @@ -1386,15 +1386,15 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, size = PAGE_ALIGN(size); - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); + attrs = DMA_ATTR_WRITE_COMBINE; if (ofbi->rotation_type = OMAP_DSS_ROT_VRFB) - dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); + attrs |= DMA_ATTR_NO_KERNEL_MAPPING; DBG("allocating %lu bytes for fb %d\n", size, ofbi->id); token = dma_alloc_attrs(fbdev->dev, size, &dma_handle, - GFP_KERNEL, &attrs); + GFP_KERNEL, attrs); if (token = NULL) { dev_err(fbdev->dev, "failed to allocate framebuffer\n"); @@ -1408,7 +1408,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, r = omap_vrfb_request_ctx(&rg->vrfb); if (r) { dma_free_attrs(fbdev->dev, size, token, dma_handle, - &attrs); + attrs); dev_err(fbdev->dev, "vrfb create ctx failed\n"); return r; } diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb.h b/drivers/video/fbdev/omap2/omapfb/omapfb.h index 623cd872a367..8aaa2f643820 100644 --- a/drivers/video/fbdev/omap2/omapfb/omapfb.h +++ b/drivers/video/fbdev/omap2/omapfb/omapfb.h @@ -28,7 +28,6 @@ #endif #include <linux/rwsem.h> -#include <linux/dma-attrs.h> #include <linux/dma-mapping.h> #include <video/omapdss.h> @@ -51,7 +50,7 @@ extern bool omapfb_debug; struct omapfb2_mem_region { int id; - struct dma_attrs attrs; + unsigned long attrs; void *token; dma_addr_t dma_handle; u32 paddr; -- 1.9.1
next prev parent reply other threads:[~2016-06-10 10:21 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-10 10:11 [PATCH v4 00/44] dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 01/44] " Krzysztof Kozlowski 2016-06-10 14:49 ` Luis R. Rodriguez 2016-06-10 20:16 ` Krzysztof Kozlowski 2016-06-10 20:23 ` Luis R. Rodriguez 2016-06-10 20:44 ` Krzysztof Kozlowski 2016-06-10 21:08 ` Luis R. Rodriguez 2016-06-13 16:00 ` Christoph Hellwig 2016-06-13 17:41 ` Luis R. Rodriguez 2016-06-10 10:11 ` [PATCH v4 02/44] alpha: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 03/44] arc: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:54 ` Vineet Gupta 2016-06-10 10:54 ` Vineet Gupta 2016-06-10 10:11 ` [PATCH v4 04/44] ARM: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 05/44] arm64: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:51 ` Robin Murphy 2016-06-10 10:51 ` Robin Murphy 2016-06-10 10:55 ` Krzysztof Kozlowski 2016-06-10 10:55 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 06/44] avr32: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 07/44] blackfin: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 08/44] c6x: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 09/44] cris: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 10/44] frv: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 11/44] drm/exynos: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 12/44] drm/mediatek: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 14/44] drm/nouveau: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 15/44] drm/rockship: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 16/44] infiniband: " Krzysztof Kozlowski [not found] ` <1465553521-27303-17-git-send-email-k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2016-06-10 18:18 ` Bart Van Assche 2016-06-10 18:18 ` Bart Van Assche [not found] ` <b4d3a64b-afa6-fb2d-1516-831b5ea45129-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org> 2016-06-13 15:08 ` Krzysztof Kozlowski 2016-06-13 15:08 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 17/44] iommu: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 18/44] [media] " Krzysztof Kozlowski [not found] ` <575AB26E.4020401@st.com> 2016-06-10 12:37 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 19/44] xen: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 20/44] swiotlb: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 21/44] powerpc: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski [this message] 2016-06-10 10:11 ` [PATCH v4 22/44] video: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 23/44] x86: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 24/44] iommu: intel: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 25/44] h8300: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 26/44] hexagon: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 27/44] ia64: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 28/44] m68k: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 29/44] metag: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 30/44] microblaze: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 31/44] mips: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 32/44] mn10300: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 33/44] nios2: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 34/44] openrisc: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 35/44] parisc: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 36/44] misc: mic: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 37/44] s390: " Krzysztof Kozlowski 2016-06-10 16:30 ` Gerald Schaefer 2016-06-10 10:11 ` [PATCH v4 38/44] sh: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 39/44] sparc: " Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 17:43 ` David Miller 2016-06-10 17:43 ` David Miller 2016-06-10 20:03 ` Krzysztof Kozlowski 2016-06-10 20:03 ` Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 40/44] tile: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 41/44] unicore32: " Krzysztof Kozlowski 2016-06-10 10:11 ` [PATCH v4 42/44] xtensa: " Krzysztof Kozlowski 2016-06-10 10:12 ` [PATCH v4 43/44] dma-mapping: Remove dma_get_attr Krzysztof Kozlowski [not found] ` <1465553521-27303-1-git-send-email-k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2016-06-10 10:11 ` [PATCH v4 13/44] drm/msm: dma-mapping: Use unsigned long for dma_attrs Krzysztof Kozlowski 2016-06-10 10:11 ` Krzysztof Kozlowski 2016-06-10 10:12 ` [PATCH v4 43/44] dma-mapping: Remove dma_get_attr Krzysztof Kozlowski 2016-06-10 10:12 ` Krzysztof Kozlowski 2016-06-10 10:12 ` Krzysztof Kozlowski 2016-06-10 10:12 ` Krzysztof Kozlowski 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:55 ` Vineet Gupta 2016-06-10 10:58 ` Robin Murphy [not found] ` <1465553521-27303-44-git-send-email-k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2016-06-10 10:58 ` Robin Murphy 2016-06-10 10:58 ` Robin Murphy 2016-06-10 10:58 ` Robin Murphy 2016-06-10 10:58 ` Robin Murphy 2016-06-10 10:12 ` [PATCH v4 44/44] dma-mapping: Document the DMA attributes next to the declaration Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465553521-27303-23-git-send-email-k.kozlowski@samsung.com \ --to=k.kozlowski@samsung.com \ --cc=akpm@linux-foundation.org \ --cc=b.zolnierkie@samsung.com \ --cc=hch@infradead.org \ --cc=kirill.shutemov@linux.intel.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=oleg@redhat.com \ --cc=plagnioj@jcrosoft.com \ --cc=tomi.valkeinen@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.