target/linux/brcm2708/patches-4.4/0116-drm-Use-the-driver-s-gem_object_free-function-from-C.patch

   1 From 7d4ed9f40e9484ded3965b13fbb7914a1daf85d7 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 116/170] drm: Use the driver's gem_object_free function from
   5  CMA helpers.
   6
   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.
  11
  12 Signed-off-by: Eric Anholt <eric@anholt.net>
  13 ---
  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(-)
  17
  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);
  22         if (IS_ERR(fbi)) {
  23                 ret = PTR_ERR(fbi);
  24 -               goto err_drm_gem_cma_free_object;
  25 +               goto err_gem_free_object;
  26         }
  27
  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
  30
  31  err_fb_info_destroy:
  32         drm_fb_helper_release_fbi(helper);
  33 -err_drm_gem_cma_free_object:
  34 -       drm_gem_cma_free_object(&obj->base);
  35 +err_gem_free_object:
  36 +       dev->driver->gem_free_object(&obj->base);
  37         return ret;
  38  }
  39
  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
  43         return cma_obj;
  44
  45  error:
  46 -       drm_gem_cma_free_object(&cma_obj->base);
  47 +       drm->driver->gem_free_object(&cma_obj->base);
  48         return ERR_PTR(ret);
  49  }
  50  EXPORT_SYMBOL_GPL(drm_gem_cma_create);
  51 @@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct dr
  52         return cma_obj;
  53
  54  err_handle_create:
  55 -       drm_gem_cma_free_object(gem_obj);
  56 +       drm->driver->gem_free_object(gem_obj);
  57
  58         return ERR_PTR(ret);
  59  }