Let mmap method to use dma_mmap_coherent call. Moreover, this patch removes vb2_mmap_pfn_range from videobuf2 helpers as it was suggested by Laurent Pinchart. The function is no longer used in vb2 code.
Unified · Split
| @@ -178,14 +178,38 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) · 177 unmodified lines | ||
| 178 | 178 | static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) |
| 179 | 179 | { |
| 180 | 180 | struct vb2_dc_buf *buf = buf_priv; |
| 181 | + int ret; | |
| 181 | 182 | |
| 182 | 183 | if (!buf) { |
| 183 | 184 | printk(KERN_ERR "No buffer to map\n"); |
| 184 | 185 | return -EINVAL; |
| 185 | 186 | } |
| 186 | 187 | |
| 187 | − return vb2_mmap_pfn_range(vma, buf->dma_addr, buf->size, | |
| 188 | − &vb2_common_vm_ops, &buf->handler); | |
| 188 | + /* | |
| 189 | + * dma_mmap_* uses vm_pgoff as in-buffer offset, but we want to | |
| 190 | + * map whole buffer | |
| 191 | + */ | |
| 192 | + vma->vm_pgoff = 0; | |
| 193 | + | |
| 194 | + ret = dma_mmap_coherent(buf->dev, vma, buf->vaddr, | |
| 195 | + buf->dma_addr, buf->size); | |
| 196 | + | |
| 197 | + if (ret) { | |
| 198 | + pr_err("Remapping memory failed, error: %d\n", ret); | |
| 199 | + return ret; | |
| 200 | + } | |
| 201 | + | |
| 202 | + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; | |
| 203 | + vma->vm_private_data = &buf->handler; | |
| 204 | + vma->vm_ops = &vb2_common_vm_ops; | |
| 205 | + | |
| 206 | + vma->vm_ops->open(vma); | |
| 207 | + | |
| 208 | + pr_debug("%s: mapped dma addr 0x%08lx at 0x%08lx, size %ld\n", | |
| 209 | + __func__, (unsigned long)buf->dma_addr, vma->vm_start, | |
| 210 | + buf->size); | |
| 211 | + | |
| 212 | + return 0; | |
| 189 | 213 | } |
| 190 | 214 | |
| 191 | 215 | /*********************************************/ |
| @@ -136,46 +136,6 @@ int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size, · 135 unmodified lines | ||
| 136 | 136 | } |
| 137 | 137 | EXPORT_SYMBOL_GPL(vb2_get_contig_userptr); |
| 138 | 138 | |
| 139 | −/** | |
| 140 | − * vb2_mmap_pfn_range() - map physical pages to userspace | |
| 141 | − * @vma: virtual memory region for the mapping | |
| 142 | − * @paddr: starting physical address of the memory to be mapped | |
| 143 | − * @size: size of the memory to be mapped | |
| 144 | − * @vm_ops: vm operations to be assigned to the created area | |
| 145 | − * @priv: private data to be associated with the area | |
| 146 | − * | |
| 147 | − * Returns 0 on success. | |
| 148 | − */ | |
| 149 | −int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, | |
| 150 | − unsigned long size, | |
| 151 | − const struct vm_operations_struct *vm_ops, | |
| 152 | − void *priv) | |
| 153 | −{ | |
| 154 | − int ret; | |
| 155 | − | |
| 156 | − size = min_t(unsigned long, vma->vm_end - vma->vm_start, size); | |
| 157 | − | |
| 158 | − vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | |
| 159 | − ret = remap_pfn_range(vma, vma->vm_start, paddr >> PAGE_SHIFT, | |
| 160 | − size, vma->vm_page_prot); | |
| 161 | − if (ret) { | |
| 162 | − printk(KERN_ERR "Remapping memory failed, error: %d\n", ret); | |
| 163 | − return ret; | |
| 164 | − } | |
| 165 | − | |
| 166 | − vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; | |
| 167 | − vma->vm_private_data = priv; | |
| 168 | − vma->vm_ops = vm_ops; | |
| 169 | − | |
| 170 | − vma->vm_ops->open(vma); | |
| 171 | − | |
| 172 | − pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n", | |
| 173 | − __func__, paddr, vma->vm_start, size); | |
| 174 | − | |
| 175 | − return 0; | |
| 176 | −} | |
| 177 | −EXPORT_SYMBOL_GPL(vb2_mmap_pfn_range); | |
| 178 | − | |
| 179 | 139 | /** |
| 180 | 140 | * vb2_common_vm_open() - increase refcount of the vma |
| 181 | 141 | * @vma: virtual memory region for the mapping |
| @@ -33,11 +33,6 @@ extern const struct vm_operations_struct vb2_common_vm_ops; · 32 unmodified lines | ||
| 33 | 33 | int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size, |
| 34 | 34 | struct vm_area_struct **res_vma, dma_addr_t *res_pa); |
| 35 | 35 | |
| 36 | −int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, | |
| 37 | − unsigned long size, | |
| 38 | − const struct vm_operations_struct *vm_ops, | |
| 39 | − void *priv); | |
| 40 | − | |
| 41 | 36 | struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma); |
| 42 | 37 | void vb2_put_vma(struct vm_area_struct *vma); |
| 43 | 38 | |