mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
drm/tegra: gem: Make __tegra_gem_mmap() available more widely
This function allows mapping a GEM object into a virtual memory address space, which makes it useful outside of the GEM code. While at it, rename the function so it doesn't clash with the function that implements the DRM_TEGRA_GEM_MMAP IOCTL. Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
parent
b6d7974d10
commit
04c0746663
2 changed files with 4 additions and 4 deletions
|
@ -459,8 +459,7 @@ const struct vm_operations_struct tegra_bo_vm_ops = {
|
||||||
.close = drm_gem_vm_close,
|
.close = drm_gem_vm_close,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int tegra_gem_mmap(struct drm_gem_object *gem,
|
int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma)
|
||||||
struct vm_area_struct *vma)
|
|
||||||
{
|
{
|
||||||
struct tegra_bo *bo = to_tegra_bo(gem);
|
struct tegra_bo *bo = to_tegra_bo(gem);
|
||||||
|
|
||||||
|
@ -507,7 +506,7 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma)
|
||||||
|
|
||||||
gem = vma->vm_private_data;
|
gem = vma->vm_private_data;
|
||||||
|
|
||||||
return tegra_gem_mmap(gem, vma);
|
return __tegra_gem_mmap(gem, vma);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sg_table *
|
static struct sg_table *
|
||||||
|
@ -600,7 +599,7 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
return tegra_gem_mmap(gem, vma);
|
return __tegra_gem_mmap(gem, vma);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *tegra_gem_prime_vmap(struct dma_buf *buf)
|
static void *tegra_gem_prime_vmap(struct dma_buf *buf)
|
||||||
|
|
|
@ -70,6 +70,7 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
|
||||||
|
|
||||||
extern const struct vm_operations_struct tegra_bo_vm_ops;
|
extern const struct vm_operations_struct tegra_bo_vm_ops;
|
||||||
|
|
||||||
|
int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma);
|
||||||
int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma);
|
int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma);
|
||||||
|
|
||||||
struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
|
struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
|
||||||
|
|
Loading…
Reference in a new issue