drm/vram-helper: Support struct drm_driver.gem_create_object

Drivers that what to allocate VRAM GEM objects with additional fields
can now do this by implementing struct drm_driver.gem_create_object.

v3:
	* separately check allocation failure in if/else branches
	  before upcast to gbo
v2:
	* only cast to gbo within if branch; set gbo directly
	  in else branch

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200106125745.13797-9-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 942af7edcd0c4069ced1ec74fb82eed4ae0d15a2..a4863326061a49f802a95b051d80b3d0fc425314 100644 (file)
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -2,6 +2,7 @@
 
 #include <drm/drm_debugfs.h>
 #include <drm/drm_device.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_gem_ttm_helper.h>
@@ -145,9 +146,17 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
        struct drm_gem_vram_object *gbo;
        int ret;
 
-       gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
-       if (!gbo)
-               return ERR_PTR(-ENOMEM);
+       if (dev->driver->gem_create_object) {
+               struct drm_gem_object *gem =
+                       dev->driver->gem_create_object(dev, size);
+               if (!gem)
+                       return ERR_PTR(-ENOMEM);
+               gbo = drm_gem_vram_of_gem(gem);
+       } else {
+               gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
+               if (!gbo)
+                       return ERR_PTR(-ENOMEM);
+       }
 
        ret = drm_gem_vram_init(dev, gbo, size, pg_align);
        if (ret < 0)