7938f42181
Rename struct dma_buf_map to struct iosys_map and corresponding APIs. Over time dma-buf-map grew up to more functionality than the one used by dma-buf: in fact it's just a shim layer to abstract system memory, that can be accessed via regular load and store, from IO memory that needs to be acessed via arch helpers. The idea is to extend this API so it can fulfill other needs, internal to a single driver. Example: in the i915 driver it's desired to share the implementation for integrated graphics, which uses mostly system memory, with discrete graphics, which may need to access IO memory. The conversion was mostly done with the following semantic patch: @r1@ @@ - struct dma_buf_map + struct iosys_map @r2@ @@ ( - DMA_BUF_MAP_INIT_VADDR + IOSYS_MAP_INIT_VADDR | - dma_buf_map_set_vaddr + iosys_map_set_vaddr | - dma_buf_map_set_vaddr_iomem + iosys_map_set_vaddr_iomem | - dma_buf_map_is_equal + iosys_map_is_equal | - dma_buf_map_is_null + iosys_map_is_null | - dma_buf_map_is_set + iosys_map_is_set | - dma_buf_map_clear + iosys_map_clear | - dma_buf_map_memcpy_to + iosys_map_memcpy_to | - dma_buf_map_incr + iosys_map_incr ) @@ @@ - #include <linux/dma-buf-map.h> + #include <linux/iosys-map.h> Then some files had their includes adjusted and some comments were update to remove mentions to dma-buf-map. Since this is not specific to dma-buf anymore, move the documentation to the "Bus-Independent Device Accesses" section. v2: - Squash patches v3: - Fix wrong removal of dma-buf.h from MAINTAINERS - Move documentation from dma-buf.rst to device-io.rst v4: - Change documentation title and level Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Christian König <christian.koenig@amd.com> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20220204170541.829227-1-lucas.demarchi@intel.com
76 lines
2.6 KiB
C
76 lines
2.6 KiB
C
/*
|
|
* Copyright 2013 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Dave Airlie
|
|
* Alon Levy
|
|
*/
|
|
#ifndef QXL_OBJECT_H
|
|
#define QXL_OBJECT_H
|
|
|
|
#include "qxl_drv.h"
|
|
|
|
static inline int qxl_bo_reserve(struct qxl_bo *bo)
|
|
{
|
|
int r;
|
|
|
|
r = ttm_bo_reserve(&bo->tbo, true, false, NULL);
|
|
if (unlikely(r != 0)) {
|
|
if (r != -ERESTARTSYS) {
|
|
struct drm_device *ddev = bo->tbo.base.dev;
|
|
|
|
dev_err(ddev->dev, "%p reserve failed\n", bo);
|
|
}
|
|
return r;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline void qxl_bo_unreserve(struct qxl_bo *bo)
|
|
{
|
|
ttm_bo_unreserve(&bo->tbo);
|
|
}
|
|
|
|
static inline unsigned long qxl_bo_size(struct qxl_bo *bo)
|
|
{
|
|
return bo->tbo.base.size;
|
|
}
|
|
|
|
extern int qxl_bo_create(struct qxl_device *qdev,
|
|
unsigned long size,
|
|
bool kernel, bool pinned, u32 domain,
|
|
u32 priority,
|
|
struct qxl_surface *surf,
|
|
struct qxl_bo **bo_ptr);
|
|
int qxl_bo_vmap(struct qxl_bo *bo, struct iosys_map *map);
|
|
int qxl_bo_vmap_locked(struct qxl_bo *bo, struct iosys_map *map);
|
|
int qxl_bo_vunmap(struct qxl_bo *bo);
|
|
void qxl_bo_vunmap_locked(struct qxl_bo *bo);
|
|
void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, struct qxl_bo *bo, int page_offset);
|
|
void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev, struct qxl_bo *bo, void *map);
|
|
extern struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo);
|
|
extern void qxl_bo_unref(struct qxl_bo **bo);
|
|
extern int qxl_bo_pin(struct qxl_bo *bo);
|
|
extern int qxl_bo_unpin(struct qxl_bo *bo);
|
|
extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain);
|
|
extern bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo);
|
|
|
|
#endif
|