target/linux/brcm2708/patches-4.4/0094-drm-vc4-bo-cache-locking-cleanup.patch

   1 From a62d7adb16fdd9c450a0a255a3e0946c62b30b20 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Mon, 19 Oct 2015 08:29:41 -0700
   4 Subject: [PATCH 094/127] drm/vc4: bo cache locking cleanup.
   5
   6 Signed-off-by: Eric Anholt <eric@anholt.net>
   7 ---
   8  drivers/gpu/drm/vc4/vc4_bo.c | 22 +++++++++-------------
   9  1 file changed, 9 insertions(+), 13 deletions(-)
  10
  11 --- a/drivers/gpu/drm/vc4/vc4_bo.c
  12 +++ b/drivers/gpu/drm/vc4/vc4_bo.c
  13 @@ -215,7 +215,6 @@ vc4_bo_cache_free_old(struct drm_device
  14         struct vc4_dev *vc4 = to_vc4_dev(dev);
  15         unsigned long expire_time = jiffies - msecs_to_jiffies(1000);
  16
  17 -       mutex_lock(&vc4->bo_lock);
  18         while (!list_empty(&vc4->bo_cache.time_list)) {
  19                 struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list,
  20                                                     struct vc4_bo, unref_head);
  21 @@ -223,14 +222,12 @@ vc4_bo_cache_free_old(struct drm_device
  22                         mod_timer(&vc4->bo_cache.time_timer,
  23                                   round_jiffies_up(jiffies +
  24                                                    msecs_to_jiffies(1000)));
  25 -                       mutex_unlock(&vc4->bo_lock);
  26                         return;
  27                 }
  28
  29                 vc4_bo_remove_from_cache(bo);
  30                 vc4_bo_destroy(bo);
  31         }
  32 -       mutex_unlock(&vc4->bo_lock);
  33  }
  34
  35  /* Called on the last userspace/kernel unreference of the BO.  Returns
  36 @@ -245,29 +242,24 @@ void vc4_free_object(struct drm_gem_obje
  37         struct vc4_bo *bo = to_vc4_bo(gem_bo);
  38         struct list_head *cache_list;
  39
  40 +       mutex_lock(&vc4->bo_lock);
  41         /* If the object references someone else's memory, we can't cache it.
  42          */
  43         if (gem_bo->import_attach) {
  44 -               mutex_lock(&vc4->bo_lock);
  45                 vc4_bo_destroy(bo);
  46 -               mutex_unlock(&vc4->bo_lock);
  47 -               return;
  48 +               goto out;
  49         }
  50
  51         /* Don't cache if it was publicly named. */
  52         if (gem_bo->name) {
  53 -               mutex_lock(&vc4->bo_lock);
  54                 vc4_bo_destroy(bo);
  55 -               mutex_unlock(&vc4->bo_lock);
  56 -               return;
  57 +               goto out;
  58         }
  59
  60 -       mutex_lock(&vc4->bo_lock);
  61         cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size);
  62         if (!cache_list) {
  63                 vc4_bo_destroy(bo);
  64 -               mutex_unlock(&vc4->bo_lock);
  65 -               return;
  66 +               goto out;
  67         }
  68
  69         if (bo->validated_shader) {
  70 @@ -282,9 +274,11 @@ void vc4_free_object(struct drm_gem_obje
  71
  72         vc4->bo_stats.num_cached++;
  73         vc4->bo_stats.size_cached += gem_bo->size;
  74 -       mutex_unlock(&vc4->bo_lock);
  75
  76         vc4_bo_cache_free_old(dev);
  77 +
  78 +out:
  79 +       mutex_unlock(&vc4->bo_lock);
  80  }
  81
  82  static void vc4_bo_cache_time_work(struct work_struct *work)
  83 @@ -293,7 +287,9 @@ static void vc4_bo_cache_time_work(struc
  84                 container_of(work, struct vc4_dev, bo_cache.time_work);
  85         struct drm_device *dev = vc4->dev;
  86
  87 +       mutex_lock(&vc4->bo_lock);
  88         vc4_bo_cache_free_old(dev);
  89 +       mutex_unlock(&vc4->bo_lock);
  90  }
  91
  92  static void vc4_bo_cache_time_timer(unsigned long data)