| Message ID | 20190621115755.8481-10-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ttm: make ttm bo a gem bo subclass | expand |
Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Am 21.06.19 um 13:57 schrieb Gerd Hoffmann: > The wrapper doesn't do anything any more, drop it. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > include/drm/drm_gem_vram_helper.h | 4 +--- > drivers/gpu/drm/drm_gem_vram_helper.c | 17 ----------------- > 2 files changed, 1 insertion(+), 20 deletions(-) > > diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h > index 7b9f50ba3fce..2ada671a2a6b 100644 > --- a/include/drm/drm_gem_vram_helper.h > +++ b/include/drm/drm_gem_vram_helper.h > @@ -137,8 +137,6 @@ void drm_gem_vram_driver_gem_prime_unpin(struct drm_gem_object *obj); > void *drm_gem_vram_driver_gem_prime_vmap(struct drm_gem_object *obj); > void drm_gem_vram_driver_gem_prime_vunmap(struct drm_gem_object *obj, > void *vaddr); > -int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *obj, > - struct vm_area_struct *vma); > > #define DRM_GEM_VRAM_DRIVER_PRIME \ > .gem_prime_export = drm_gem_prime_export, \ > @@ -147,6 +145,6 @@ int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *obj, > .gem_prime_unpin = drm_gem_vram_driver_gem_prime_unpin, \ > .gem_prime_vmap = drm_gem_vram_driver_gem_prime_vmap, \ > .gem_prime_vunmap = drm_gem_vram_driver_gem_prime_vunmap, \ > - .gem_prime_mmap = drm_gem_vram_driver_gem_prime_mmap > + .gem_prime_mmap = drm_gem_prime_mmap > > #endif > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c > index 2e474dee30df..d78761802374 100644 > --- a/drivers/gpu/drm/drm_gem_vram_helper.c > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c > @@ -619,20 +619,3 @@ void drm_gem_vram_driver_gem_prime_vunmap(struct drm_gem_object *gem, > drm_gem_vram_unpin(gbo); > } > EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_vunmap); > - > -/** > - * drm_gem_vram_driver_gem_prime_mmap() - \ > - Implements &struct drm_driver.gem_prime_mmap > - * @gem: The GEM object to map > - * @vma: The VMA describing the mapping > - * > - * Returns: > - * 0 on success, or > - * a negative errno code otherwise. > - */ > -int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *gem, > - struct vm_area_struct *vma) > -{ > - return drm_gem_prime_mmap(gem, vma); > -} > -EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_mmap); >
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h index 7b9f50ba3fce..2ada671a2a6b 100644 --- a/include/drm/drm_gem_vram_helper.h +++ b/include/drm/drm_gem_vram_helper.h @@ -137,8 +137,6 @@ void drm_gem_vram_driver_gem_prime_unpin(struct drm_gem_object *obj); void *drm_gem_vram_driver_gem_prime_vmap(struct drm_gem_object *obj); void drm_gem_vram_driver_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); -int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *obj, - struct vm_area_struct *vma); #define DRM_GEM_VRAM_DRIVER_PRIME \ .gem_prime_export = drm_gem_prime_export, \ @@ -147,6 +145,6 @@ int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *obj, .gem_prime_unpin = drm_gem_vram_driver_gem_prime_unpin, \ .gem_prime_vmap = drm_gem_vram_driver_gem_prime_vmap, \ .gem_prime_vunmap = drm_gem_vram_driver_gem_prime_vunmap, \ - .gem_prime_mmap = drm_gem_vram_driver_gem_prime_mmap + .gem_prime_mmap = drm_gem_prime_mmap #endif diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 2e474dee30df..d78761802374 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -619,20 +619,3 @@ void drm_gem_vram_driver_gem_prime_vunmap(struct drm_gem_object *gem, drm_gem_vram_unpin(gbo); } EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_vunmap); - -/** - * drm_gem_vram_driver_gem_prime_mmap() - \ - Implements &struct drm_driver.gem_prime_mmap - * @gem: The GEM object to map - * @vma: The VMA describing the mapping - * - * Returns: - * 0 on success, or - * a negative errno code otherwise. - */ -int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *gem, - struct vm_area_struct *vma) -{ - return drm_gem_prime_mmap(gem, vma); -} -EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_mmap);
The wrapper doesn't do anything any more, drop it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- include/drm/drm_gem_vram_helper.h | 4 +--- drivers/gpu/drm/drm_gem_vram_helper.c | 17 ----------------- 2 files changed, 1 insertion(+), 20 deletions(-)