You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
drm/omap: add GEM support for tiled/dmm buffers
TILER/DMM provides two features for omapdrm GEM objects: 1) providing a physically contiguous view to discontiguous memory for hw initiators that cannot otherwise support discontiguous buffers (DSS scanout, IVAHD video decode/encode, etc) 2) providing untiling for 2d tiled buffers, which are used in some cases to provide rotation and reduce memory bandwidth for hw initiators that tend to access data in 2d block patterns. For 2d tiled buffers, there are some additional complications when it comes to userspace mmap'ings. For non-tiled buffers, the original (potentially physically discontiguous) pages are used to back the mmap. For tiled buffers, we need to mmap via the tiler/dmm region to provide an unswizzled view of the buffer. But (a) the buffer is not necessarily pinned in TILER all the time (it can be unmapped when there is no DMA access to the buffer), and (b) when they are they are pinned, they not necessarily page aligned from the perspective of the CPU. And non-page aligned userspace buffer mapping is evil. To solve this, we reserve one or more small regions in each of the 2d containers when the driver is loaded to use as a "user-GART" where we can create a second page-aligned mapping of parts of the buffer being accessed from userspace. Page faulting is used to evict and remap different regions of whichever buffers are being accessed from user- space. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
71e8831f64
commit
f7f9f4536a
@@ -22,6 +22,11 @@ TODO
|
||||
. Review DSS vs KMS mismatches. The omap_dss_device is sort of part encoder,
|
||||
part connector. Which results in a bit of duct tape to fwd calls from
|
||||
encoder to connector. Possibly this could be done a bit better.
|
||||
. Solve PM sequencing on resume. DMM/TILER must be reloaded before any
|
||||
access is made from any component in the system. Which means on suspend
|
||||
CRTC's should be disabled, and on resume the LUT should be reprogrammed
|
||||
before CRTC's are re-enabled, to prevent DSS from trying to DMA from a
|
||||
buffer mapped in DMM/TILER before LUT is reloaded.
|
||||
. Add debugfs information for DMM/TILER
|
||||
|
||||
Userspace:
|
||||
|
||||
@@ -509,7 +509,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
args->size = obj->size; /* for now */
|
||||
args->size = omap_gem_mmap_size(obj);
|
||||
args->offset = omap_gem_mmap_offset(obj);
|
||||
|
||||
drm_gem_object_unreference_unlocked(obj);
|
||||
@@ -557,6 +557,8 @@ static int dev_load(struct drm_device *dev, unsigned long flags)
|
||||
|
||||
dev->dev_private = priv;
|
||||
|
||||
omap_gem_init(dev);
|
||||
|
||||
ret = omap_modeset_init(dev);
|
||||
if (ret) {
|
||||
dev_err(dev->dev, "omap_modeset_init failed: ret=%d\n", ret);
|
||||
@@ -589,8 +591,8 @@ static int dev_unload(struct drm_device *dev)
|
||||
drm_kms_helper_poll_fini(dev);
|
||||
|
||||
omap_fbdev_free(dev);
|
||||
|
||||
omap_modeset_free(dev);
|
||||
omap_gem_deinit(dev);
|
||||
|
||||
kfree(dev->dev_private);
|
||||
dev->dev_private = NULL;
|
||||
|
||||
@@ -84,6 +84,8 @@ struct drm_connector *omap_framebuffer_get_next_connector(
|
||||
void omap_framebuffer_flush(struct drm_framebuffer *fb,
|
||||
int x, int y, int w, int h);
|
||||
|
||||
void omap_gem_init(struct drm_device *dev);
|
||||
void omap_gem_deinit(struct drm_device *dev);
|
||||
|
||||
struct drm_gem_object *omap_gem_new(struct drm_device *dev,
|
||||
union omap_gem_size gsize, uint32_t flags);
|
||||
@@ -109,6 +111,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,
|
||||
dma_addr_t *paddr, bool remap);
|
||||
int omap_gem_put_paddr(struct drm_gem_object *obj);
|
||||
uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj);
|
||||
size_t omap_gem_mmap_size(struct drm_gem_object *obj);
|
||||
|
||||
static inline int align_pitch(int pitch, int width, int bpp)
|
||||
{
|
||||
|
||||
@@ -102,7 +102,7 @@ int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
|
||||
* dma_alloc_coherent()). But this should be ok because it
|
||||
* is only used by legacy fbdev
|
||||
*/
|
||||
BUG_ON(!bo_vaddr);
|
||||
BUG_ON(IS_ERR_OR_NULL(bo_vaddr));
|
||||
*vaddr = bo_vaddr + offset;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -112,3 +112,58 @@ void _drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
|
||||
|
||||
drm_free_large(pages);
|
||||
}
|
||||
|
||||
int
|
||||
_drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
|
||||
{
|
||||
struct drm_device *dev = obj->dev;
|
||||
struct drm_gem_mm *mm = dev->mm_private;
|
||||
struct drm_map_list *list;
|
||||
struct drm_local_map *map;
|
||||
int ret = 0;
|
||||
|
||||
/* Set the object up for mmap'ing */
|
||||
list = &obj->map_list;
|
||||
list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
|
||||
if (!list->map)
|
||||
return -ENOMEM;
|
||||
|
||||
map = list->map;
|
||||
map->type = _DRM_GEM;
|
||||
map->size = size;
|
||||
map->handle = obj;
|
||||
|
||||
/* Get a DRM GEM mmap offset allocated... */
|
||||
list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
|
||||
size / PAGE_SIZE, 0, 0);
|
||||
|
||||
if (!list->file_offset_node) {
|
||||
DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
|
||||
ret = -ENOSPC;
|
||||
goto out_free_list;
|
||||
}
|
||||
|
||||
list->file_offset_node = drm_mm_get_block(list->file_offset_node,
|
||||
size / PAGE_SIZE, 0);
|
||||
if (!list->file_offset_node) {
|
||||
ret = -ENOMEM;
|
||||
goto out_free_list;
|
||||
}
|
||||
|
||||
list->hash.key = list->file_offset_node->start;
|
||||
ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to add to map hash\n");
|
||||
goto out_free_mm;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_mm:
|
||||
drm_mm_put_block(list->file_offset_node);
|
||||
out_free_list:
|
||||
kfree(list->map);
|
||||
list->map = NULL;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user