From: Stanislav Vorobiov <s.vorobiov@samsung.com>
Date: Mon, 6 May 2013 16:39:28 +0000 (+0400)
Subject: VIGS: Fixed GEM reserve deadlock
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e2a5a9f1d54645dee3e25f40617b381b650ac54;p=sdk%2Femulator%2Femulator-kernel.git

VIGS: Fixed GEM reserve deadlock
---

diff --git a/drivers/gpu/drm/vigs/vigs_device.c b/drivers/gpu/drm/vigs/vigs_device.c
index 039339035961..f07f4bd3a754 100644
--- a/drivers/gpu/drm/vigs/vigs_device.c
+++ b/drivers/gpu/drm/vigs/vigs_device.c
@@ -89,6 +89,21 @@ static struct vigs_surface
     return sfc;
 }
 
+static bool vigs_gem_is_reserved(struct list_head* gem_list,
+                                 struct vigs_gem_object *gem)
+{
+    struct vigs_gem_object *tmp;
+
+    list_for_each_entry(tmp, gem_list, list)
+    {
+        if (tmp == gem) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 /*
  * 'gem_list' will hold a list of GEMs that should be
  * unreserved and unreferenced after execution.
@@ -137,7 +152,12 @@ static int vigs_device_patch_commands(struct vigs_device *vigs_dev,
                 ret = -EINVAL;
                 break;
             }
-            vigs_gem_reserve(&sfc->gem);
+            if (vigs_gem_is_reserved(gem_list, &sfc->gem)) {
+                drm_gem_object_unreference_unlocked(&sfc->gem.base);
+            } else {
+                vigs_gem_reserve(&sfc->gem);
+                list_add_tail(&sfc->gem.list, gem_list);
+            }
             if (vigs_gem_in_vram(&sfc->gem)) {
                 update_vram_request->offset = vigs_gem_offset(&sfc->gem);
             } else {
@@ -145,7 +165,6 @@ static int vigs_device_patch_commands(struct vigs_device *vigs_dev,
                                  update_vram_request->sfc_id);
                 update_vram_request->sfc_id = 0;
             }
-            list_add_tail(&sfc->gem.list, gem_list);
             break;
         case vigsp_cmd_update_gpu:
             update_gpu_request =
@@ -156,7 +175,12 @@ static int vigs_device_patch_commands(struct vigs_device *vigs_dev,
                 ret = -EINVAL;
                 break;
             }
-            vigs_gem_reserve(&sfc->gem);
+            if (vigs_gem_is_reserved(gem_list, &sfc->gem)) {
+                drm_gem_object_unreference_unlocked(&sfc->gem.base);
+            } else {
+                vigs_gem_reserve(&sfc->gem);
+                list_add_tail(&sfc->gem.list, gem_list);
+            }
             if (vigs_gem_in_vram(&sfc->gem)) {
                 update_gpu_request->offset = vigs_gem_offset(&sfc->gem);
                 sfc->is_dirty = false;
@@ -165,7 +189,6 @@ static int vigs_device_patch_commands(struct vigs_device *vigs_dev,
                                  update_gpu_request->sfc_id);
                 update_gpu_request->sfc_id = 0;
             }
-            list_add_tail(&sfc->gem.list, gem_list);
             break;
         default:
             break;