diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:40 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:40 -0800 |
| commit | ef1270e99460055ee7d66a4a22dd74bf61c17aa5 (patch) | |
| tree | 9cde5969ac70f1cdf84a4bbcc8adc2deacf4bb47 /drivers/gpu/drm/rockchip/rockchip_drm_gem.h | |
| parent | 1a4af2e40c98b62c8aaf7cb692cd9600291d339b (diff) | |
| parent | cb6846fbb83b574c85c2a80211b402a6347b60b1 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/nouveau/nouveau_fence.c
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_drm_gem.h')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h index 5a70a56cd406..47c1861eece0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -34,13 +34,6 @@ rockchip_gem_prime_import_sg_table(struct drm_device *dev, int rockchip_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); void rockchip_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map); -/* drm driver mmap file operations */ -int rockchip_gem_mmap(struct file *filp, struct vm_area_struct *vma); - -/* mmap a gem object to userspace. */ -int rockchip_gem_mmap_buf(struct drm_gem_object *obj, - struct vm_area_struct *vma); - struct rockchip_gem_object * rockchip_gem_create_object(struct drm_device *drm, unsigned int size, bool alloc_kmap); |