浏览代码

Merge a976ff28ccb56d1b227a857a7cf5f92cd60985f2 on remote branch

Change-Id: I4f241aca6df859d4f79f7bdcf26a5b43133df379
Linux Build Service Account 1 年之前
父节点
当前提交
7ba5981c13
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 6 1
      BUILD.bazel
  2. 2 3
      dsp/adsprpc.c

+ 6 - 1
BUILD.bazel

@@ -24,4 +24,9 @@ define_modules("holi", "gki")
 
 define_modules("cliffs", "consolidate")
 
-define_modules("cliffs", "gki")
+define_modules("cliffs", "gki")
+
+define_modules("pitti", "consolidate")
+
+define_modules("pitti", "gki")
+

+ 2 - 3
dsp/adsprpc.c

@@ -1011,14 +1011,13 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map, uint32_t flags)
 		map->refs--;
 		if (!map->refs && !map->is_persistent && !map->ctx_refs)
 			hlist_del_init(&map->hn);
-		spin_unlock_irqrestore(&me->hlock, irq_flags);
 		if (map->refs > 0) {
 			ADSPRPC_WARN(
 				"multiple references for remote heap size %zu va 0x%lx ref count is %d\n",
 				map->size, map->va, map->refs);
+			spin_unlock_irqrestore(&me->hlock, irq_flags);
 			return;
 		}
-		spin_lock_irqsave(&me->hlock, irq_flags);
 		if (map->is_persistent && map->in_use)
 			map->in_use = false;
 		spin_unlock_irqrestore(&me->hlock, irq_flags);
@@ -2331,7 +2330,7 @@ static void fastrpc_notify_drivers(struct fastrpc_apps *me, int cid)
 	spin_lock_irqsave(&me->hlock, irq_flags);
 	hlist_for_each_entry_safe(fl, n, &me->drivers, hn) {
 		if (fl->cid == cid) {
-			fastrpc_queue_pd_status(fl, cid, FASTRPC_DSP_SSR, 0);
+			fastrpc_queue_pd_status(fl, cid, FASTRPC_DSP_SSR, fl->sessionid);
 			fastrpc_notify_users(fl);
 		}
 	}