gdev: Fixed a conflict device open/close and Launch

CPFL · Mar 28, 2013 · a989620 · a989620
1 parent 9dfe320
commit a989620
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/common/gdev_api.c b/common/gdev_api.c
@@ -687,10 +687,15 @@ struct gdev_handle *gopen(int minor)
  */
 int gclose(struct gdev_handle *h)
 {
+	struct gdev_device *gdev=h->gdev;
+
 	if (!h)
 		return -ENOENT;
 	if (!h->gdev || !h->ctx || !h->vas)
 		return -ENOENT;
+
+	/* none can access GPU while someone is closing device. */
+	gdev_block_start(gdev);
 
 #ifndef GDEV_SCHED_DISABLED
 	if (!h->se)
@@ -709,6 +714,9 @@ int gclose(struct gdev_handle *h)
 	/* free the objects. */
 	gdev_ctx_free(h->ctx);
 	gdev_vas_free(h->vas);
+
+	gdev_block_end(gdev);
+
 	gdev_dev_close(h->gdev);
 
 	GDEV_PRINT("Closed gdev%d\n", h->dev_id);

diff --git a/common/gdev_nvidia.c b/common/gdev_nvidia.c
@@ -135,22 +135,22 @@ void gdev_block_start(struct gdev_device *gdev)
 retry:
 	if (phys) {
 		gdev_lock(&phys->global_lock);
-		if (phys->accessed) {
+		if (phys->accessed || phys->blocked) {
 			gdev_unlock(&phys->global_lock);
 			SCHED_YIELD();
 			goto retry;
 		}
-		phys->blocked = 1;
+		phys->blocked++;
 		gdev_unlock(&phys->global_lock);
 	}
 	else {
 		gdev_lock(&gdev->global_lock);
-		if (gdev->accessed) {
+		if (gdev->accessed || phys->blocked) {
 			gdev_unlock(&gdev->global_lock);
 			SCHED_YIELD();
 			goto retry;
 		}
-		gdev->blocked = 1;
+		gdev->blocked++;
 		gdev_unlock(&gdev->global_lock);
 	}
 }