drm: Use the driver's gem_object_free function from CMA helpers.
Subsystems (2)
PATCH 1/1 drm: Use the driver's gem_object_free function from CMA helpers.
VC4 wraps the CMA objects in its own structures, so it needs to do its own teardown (waiting for GPU to finish, updating bo_stats tracking). The other CMA drivers are using drm_gem_cma_free_object as their gem_free_object, so this should be a no-op for them.
--- drivers/gpu/drm/drm_fb_cma_helper.c | 6 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_fb_cma_helper.c +3 -3
@@ -279,7 +279,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper,if (!fbi) {dev_err (dev->dev,"Failed to allocate framebuffer info.\n" ); ret = -ENOMEM ; - goto err_drm_gem_cma_free_object; + goto err_gem_free_object; } fbdev_cma->fb =drm_fb_cma_alloc (dev, &mode_cmd, &obj,1 );
@@ -322,8 +322,8 @@ err_drm_fb_cma_destroy:drm_fb_cma_destroy (fb); err_framebuffer_release:framebuffer_release (fbi); -err_drm_gem_cma_free_object: -drm_gem_cma_free_object (&obj->base); +err_gem_free_object: + dev->driver->gem_free_object (&obj->base);return ret; }
drivers/gpu/drm/drm_gem_cma_helper.c +2 -2
@@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,return cma_obj; error: -drm_gem_cma_free_object (&cma_obj->base); + drm->driver->gem_free_object (&cma_obj->base);return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (drm_gem_cma_create);
@@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv,return cma_obj; err_handle_create: -drm_gem_cma_free_object (gem_obj); + drm->driver->gem_free_object (gem_obj);return ERR_PTR (ret); }
Signature · 6 lines
2.6.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Eric Anholt
VC4 wraps the CMA objects in its own structures, so it needs to do its own teardown (waiting for GPU to finish, updating
bo_statstracking). The other CMA drivers are usingdrm_gem_cma_free_objectas theirgem_free_object, so this should be a no-op for them.Signed-off-by Eric Anholt <[email protected]>
Since vc4 landed already I'll pull this into drm-misc. -Daniel
Quoted 58 lines
--- drivers/gpu/drm/drm_fb_cma_helper.c | 6 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/drm_fb_cma_helper.c +3
-3@@ -279,7 +279,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper,if (!fbi) {dev_err (dev->dev,"Failed to allocate framebuffer info.\n" ); ret = -ENOMEM ; - goto err_drm_gem_cma_free_object; + goto err_gem_free_object; } fbdev_cma->fb =drm_fb_cma_alloc (dev, &mode_cmd, &obj,1 );@@ -322,8 +322,8 @@ err_drm_fb_cma_destroy:drm_fb_cma_destroy (fb); err_framebuffer_release:framebuffer_release (fbi); -err_drm_gem_cma_free_object: -drm_gem_cma_free_object (&obj->base); +err_gem_free_object: + dev->driver->gem_free_object (&obj->base);return ret; }drivers/gpu/drm/drm_gem_cma_helper.c +2
-2@@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,return cma_obj; error: -drm_gem_cma_free_object (&cma_obj->base); + drm->driver->gem_free_object (&cma_obj->base);return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (drm_gem_cma_create);@@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv,return cma_obj; err_handle_create: -drm_gem_cma_free_object (gem_obj); + drm->driver->gem_free_object (gem_obj);return ERR_PTR (ret); }Signature · 6 lines
2.6.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Daniel Vetter
Quoted 6 lines · Eric Anholt
VC4 wraps the CMA objects in its own structures, so it needs to do its own teardown (waiting for GPU to finish, updating
bo_statstracking). The other CMA drivers are usingdrm_gem_cma_free_objectas theirgem_free_object, so this should be a no-op for them.Signed-off-by Eric Anholt <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Since vc4 landed already I'll pull this into drm-misc.
Sounds good to me. Thanks!
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel