1 From 659b247a25ea9439be74087726d6adfae7570d12 Mon Sep 17 00:00:00 2001
2 From: Eric Anholt <eric@anholt.net>
3 Date: Fri, 11 Dec 2015 19:45:03 -0800
4 Subject: [PATCH 115/232] drm: Use the driver's gem_object_free function from
7 VC4 wraps the CMA objects in its own structures, so it needs to do its
8 own teardown (waiting for GPU to finish, updating bo_stats tracking).
9 The other CMA drivers are using drm_gem_cma_free_object as their
10 gem_free_object, so this should be a no-op for them.
12 Signed-off-by: Eric Anholt <eric@anholt.net>
14 drivers/gpu/drm/drm_fb_cma_helper.c | 6 +++---
15 drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++--
16 2 files changed, 5 insertions(+), 5 deletions(-)
18 --- a/drivers/gpu/drm/drm_fb_cma_helper.c
19 +++ b/drivers/gpu/drm/drm_fb_cma_helper.c
20 @@ -266,7 +266,7 @@ static int drm_fbdev_cma_create(struct d
21 fbi = drm_fb_helper_alloc_fbi(helper);
24 - goto err_drm_gem_cma_free_object;
25 + goto err_gem_free_object;
28 fbdev_cma->fb = drm_fb_cma_alloc(dev, &mode_cmd, &obj, 1);
29 @@ -299,8 +299,8 @@ static int drm_fbdev_cma_create(struct d
32 drm_fb_helper_release_fbi(helper);
33 -err_drm_gem_cma_free_object:
34 - drm_gem_cma_free_object(&obj->base);
36 + dev->driver->gem_free_object(&obj->base);
40 --- a/drivers/gpu/drm/drm_gem_cma_helper.c
41 +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
42 @@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_c
46 - drm_gem_cma_free_object(&cma_obj->base);
47 + drm->driver->gem_free_object(&cma_obj->base);
50 EXPORT_SYMBOL_GPL(drm_gem_cma_create);
51 @@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct dr
55 - drm_gem_cma_free_object(gem_obj);
56 + drm->driver->gem_free_object(gem_obj);