Merge tag 'trace-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux.git] / include / drm / drm_gem_vram_helper.h

diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
index 9581ea0a4f7e3674cb8feac030c89ea81f414474..ac217d7684566b5afaf4d7846d99c1a5b72d5e9f 100644 (file)
--- a/include/drm/drm_gem_vram_helper.h
+++ b/include/drm/drm_gem_vram_helper.h
@@ -36,7 +36,6 @@ struct vm_area_struct;
  * video memory becomes scarce.
  */
 struct drm_gem_vram_object {
-       struct drm_gem_object gem;
        struct ttm_buffer_object bo;
        struct ttm_bo_kmap_obj kmap;
 
@@ -68,7 +67,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
 static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
        struct drm_gem_object *gem)
 {
-       return container_of(gem, struct drm_gem_vram_object, gem);
+       return container_of(gem, struct drm_gem_vram_object, bo.base);
 }
 
 struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
@@ -108,7 +107,6 @@ extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs;
  * Helpers for struct drm_driver
  */
 
-void drm_gem_vram_driver_gem_free_object_unlocked(struct drm_gem_object *gem);
 int drm_gem_vram_driver_dumb_create(struct drm_file *file,
                                    struct drm_device *dev,
                                    struct drm_mode_create_dumb *args);
@@ -124,30 +122,8 @@ int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,
  * &struct drm_driver with default functions.
  */
 #define DRM_GEM_VRAM_DRIVER \
-       .gem_free_object_unlocked = \
-               drm_gem_vram_driver_gem_free_object_unlocked, \
        .dumb_create              = drm_gem_vram_driver_dumb_create, \
-       .dumb_map_offset          = drm_gem_vram_driver_dumb_mmap_offset
-
-/*
- * PRIME helpers for struct drm_driver
- */
-
-int drm_gem_vram_driver_gem_prime_pin(struct drm_gem_object *obj);
-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, \
-       .gem_prime_import = drm_gem_prime_import, \
-       .gem_prime_pin    = drm_gem_vram_driver_gem_prime_pin, \
-       .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
+       .dumb_map_offset          = drm_gem_vram_driver_dumb_mmap_offset, \
+       .gem_prime_mmap           = drm_gem_prime_mmap
 
 #endif