[PATCH 07/13] drm/radeon: add proper locking to the SA

[j.gli...@gmail.com]

From: Christian K?nig <deathsim...@vodafone.de>

Make the suballocator self containing to locking.

v2: split the bugfix into a seperate patch.

Signed-off-by: Christian K?nig <deathsimple at vodafone.de>
Reviewed-by: Jerome Glisse <jglisse at redhat.com>
---
 drivers/gpu/drm/radeon/radeon.h    |    1 +
 drivers/gpu/drm/radeon/radeon_sa.c |   17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 85a3aa9..1aefbd9 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -381,6 +381,7 @@ struct radeon_bo_list {
  * alignment).
  */
 struct radeon_sa_manager {
+       spinlock_t              lock;
        struct radeon_bo        *bo;
        struct list_head        sa_bo;
        unsigned                size;
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c 
b/drivers/gpu/drm/radeon/radeon_sa.c
index 8fbfe69..472d346 100644
--- a/drivers/gpu/drm/radeon/radeon_sa.c
+++ b/drivers/gpu/drm/radeon/radeon_sa.c
@@ -37,6 +37,7 @@ int radeon_sa_bo_manager_init(struct radeon_device *rdev,
 {
        int r;

+       spin_lock_init(&sa_manager->lock);
        sa_manager->bo = NULL;
        sa_manager->size = size;
        sa_manager->domain = domain;
@@ -139,15 +140,15 @@ int radeon_sa_bo_new(struct radeon_device *rdev,

        BUG_ON(align > RADEON_GPU_PAGE_SIZE);
        BUG_ON(size > sa_manager->size);
+       spin_lock(&sa_manager->lock);

        /* no one ? */
-       head = sa_manager->sa_bo.prev;
        if (list_empty(&sa_manager->sa_bo)) {
+               head = &sa_manager->sa_bo;
                goto out;
        }

        /* look for a hole big enough */
-       offset = 0;
        list_for_each_entry(tmp, &sa_manager->sa_bo, list) {
                /* room before this object ? */
                if (offset < tmp->offset && (tmp->offset - offset) >= size) {
@@ -157,9 +158,8 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
                offset = tmp->offset + tmp->size;
                wasted = offset % align;
                if (wasted) {
-                       wasted = align - wasted;
+                       offset += align - wasted;
                }
-               offset += wasted;
        }
        /* room at the end ? */
        head = sa_manager->sa_bo.prev;
@@ -167,11 +167,11 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
        offset = tmp->offset + tmp->size;
        wasted = offset % align;
        if (wasted) {
-               wasted = align - wasted;
+               offset += wasted = align - wasted;
        }
-       offset += wasted;
        if ((sa_manager->size - offset) < size) {
                /* failed to find somethings big enough */
+               spin_unlock(&sa_manager->lock);
                return -ENOMEM;
        }

@@ -180,10 +180,15 @@ out:
        sa_bo->offset = offset;
        sa_bo->size = size;
        list_add(&sa_bo->list, head);
+       spin_unlock(&sa_manager->lock);
        return 0;
 }

 void radeon_sa_bo_free(struct radeon_device *rdev, struct radeon_sa_bo *sa_bo)
 {
+       struct radeon_sa_manager *sa_manager = sa_bo->manager;
+
+       spin_lock(&sa_manager->lock);
        list_del_init(&sa_bo->list);
+       spin_unlock(&sa_manager->lock);
 }
-- 
1.7.7.6