raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drm/vc4: bo cache locking fixes.

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt
2015-10-19 08:23:18 -07:00
committed by popcornmix
parent 437b9dcefb
commit e8446bbedb
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/vc4/vc4_bo.c
View File

@@ -112,14 +112,14 @@ void vc4_bo_cache_purge(struct drm_device *dev)
{ {
struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_dev *vc4 = to_vc4_dev(dev);
spin_lock(&vc4->bo_lock); mutex_lock(&vc4->bo_lock);
while (!list_empty(&vc4->bo_cache.time_list)) { while (!list_empty(&vc4->bo_cache.time_list)) {
struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list, struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list,
struct vc4_bo, unref_head); struct vc4_bo, unref_head);
vc4_bo_remove_from_cache(bo); vc4_bo_remove_from_cache(bo);
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
} }
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
} }
struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size) struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size)
@@ -134,18 +134,18 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size)
return NULL; return NULL;
/* First, try to get a vc4_bo from the kernel BO cache. */ /* First, try to get a vc4_bo from the kernel BO cache. */
spin_lock(&vc4->bo_lock); mutex_lock(&vc4->bo_lock);
if (page_index < vc4->bo_cache.size_list_size && if (page_index < vc4->bo_cache.size_list_size &&
!list_empty(&vc4->bo_cache.size_list[page_index])) { !list_empty(&vc4->bo_cache.size_list[page_index])) {
struct vc4_bo *bo = struct vc4_bo *bo =
list_first_entry(&vc4->bo_cache.size_list[page_index], list_first_entry(&vc4->bo_cache.size_list[page_index],
struct vc4_bo, size_head); struct vc4_bo, size_head);
vc4_bo_remove_from_cache(bo); vc4_bo_remove_from_cache(bo);
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
kref_init(&bo->base.base.refcount); kref_init(&bo->base.base.refcount);
return bo; return bo;
} }
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
/* Otherwise, make a new BO. */ /* Otherwise, make a new BO. */
for (pass = 0; ; pass++) { for (pass = 0; ; pass++) {
@@ -215,7 +215,7 @@ vc4_bo_cache_free_old(struct drm_device *dev)
struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_dev *vc4 = to_vc4_dev(dev);
unsigned long expire_time = jiffies - msecs_to_jiffies(1000); unsigned long expire_time = jiffies - msecs_to_jiffies(1000);
spin_lock(&vc4->bo_lock); mutex_lock(&vc4->bo_lock);
while (!list_empty(&vc4->bo_cache.time_list)) { while (!list_empty(&vc4->bo_cache.time_list)) {
struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list, struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list,
struct vc4_bo, unref_head); struct vc4_bo, unref_head);
@@ -223,14 +223,14 @@ vc4_bo_cache_free_old(struct drm_device *dev)
mod_timer(&vc4->bo_cache.time_timer, mod_timer(&vc4->bo_cache.time_timer,
round_jiffies_up(jiffies + round_jiffies_up(jiffies +
msecs_to_jiffies(1000))); msecs_to_jiffies(1000)));
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
return; return;
} }
vc4_bo_remove_from_cache(bo); vc4_bo_remove_from_cache(bo);
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
} }
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
} }
/* Called on the last userspace/kernel unreference of the BO. Returns /* Called on the last userspace/kernel unreference of the BO. Returns
@@ -248,21 +248,25 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
/* If the object references someone else's memory, we can't cache it. /* If the object references someone else's memory, we can't cache it.
*/ */
if (gem_bo->import_attach) { if (gem_bo->import_attach) {
mutex_lock(&vc4->bo_lock);
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
mutex_unlock(&vc4->bo_lock);
return; return;
} }
/* Don't cache if it was publicly named. */ /* Don't cache if it was publicly named. */
if (gem_bo->name) { if (gem_bo->name) {
mutex_lock(&vc4->bo_lock);
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
mutex_unlock(&vc4->bo_lock);
return; return;
} }
spin_lock(&vc4->bo_lock); mutex_lock(&vc4->bo_lock);
cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size); cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size);
if (!cache_list) { if (!cache_list) {
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
return; return;
} }
@@ -278,7 +282,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
vc4->bo_stats.num_cached++; vc4->bo_stats.num_cached++;
vc4->bo_stats.size_cached += gem_bo->size; vc4->bo_stats.size_cached += gem_bo->size;
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
vc4_bo_cache_free_old(dev); vc4_bo_cache_free_old(dev);
} }
@@ -465,7 +469,7 @@ void vc4_bo_cache_init(struct drm_device *dev)
{ {
struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_dev *vc4 = to_vc4_dev(dev);
spin_lock_init(&vc4->bo_lock); mutex_init(&vc4->bo_lock);
INIT_LIST_HEAD(&vc4->bo_cache.time_list); INIT_LIST_HEAD(&vc4->bo_cache.time_list);
@@ -498,9 +502,9 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *unused)
struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_dev *vc4 = to_vc4_dev(dev);
struct vc4_bo_stats stats; struct vc4_bo_stats stats;
spin_lock(&vc4->bo_lock); mutex_lock(&vc4->bo_lock);
stats = vc4->bo_stats; stats = vc4->bo_stats;
spin_unlock(&vc4->bo_lock); mutex_unlock(&vc4->bo_lock);
seq_printf(m, "num bos allocated: %d\n", stats.num_allocated); seq_printf(m, "num bos allocated: %d\n", stats.num_allocated);
seq_printf(m, "size bos allocated: %dkb\n", stats.size_allocated / 1024); seq_printf(m, "size bos allocated: %dkb\n", stats.size_allocated / 1024);

2
drivers/gpu/drm/vc4/vc4_drv.h
View File

@@ -49,7 +49,7 @@ struct vc4_dev {
} bo_stats; } bo_stats;
/* Protects bo_cache and the BO stats. */ /* Protects bo_cache and the BO stats. */
spinlock_t bo_lock; struct mutex bo_lock;
/* Sequence number for the last job queued in job_list. /* Sequence number for the last job queued in job_list.
* Starts at 0 (no jobs emitted). * Starts at 0 (no jobs emitted).