From 8dc245dc59f97474a861ccbb144e02ac6af10432 Mon Sep 17 00:00:00 2001
From: Akshata Sahukar <asahukar@codeaurora.org>
Date: Tue, 16 Jun 2020 12:45:20 -0700
Subject: [PATCH] msm: vidc: Delay force firmware unload by 1sec

Video instances might still be alive at the time firmware unload
handler is called. As a result, firmware unload request is not propagated
to firmware. Add place holder to increase default delay for this request
to 1sec to wait until all instances are closed and successfully unload
firmware.

Change-Id: Id1e7455d40c1808690148046f9a839f1b79574ae
---
 msm/vidc/msm_vidc_platform.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/msm/vidc/msm_vidc_platform.c b/msm/vidc/msm_vidc_platform.c
index b5dba03ad97d..76ddec62c6b4 100644
--- a/msm/vidc/msm_vidc_platform.c
+++ b/msm/vidc/msm_vidc_platform.c
@@ -705,6 +705,10 @@ static struct msm_vidc_common_data default_common_data[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 };
 
 static struct msm_vidc_common_data lahaina_common_data[] = {
@@ -712,6 +716,10 @@ static struct msm_vidc_common_data lahaina_common_data[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -838,6 +846,10 @@ static struct msm_vidc_common_data bengal_common_data_v0[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -901,6 +913,10 @@ static struct msm_vidc_common_data bengal_common_data_v1[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -964,6 +980,10 @@ static struct msm_vidc_common_data shima_common_data_v0[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -1074,6 +1094,10 @@ static struct msm_vidc_common_data shima_common_data_v1[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -1183,6 +1207,10 @@ static struct msm_vidc_common_data shima_common_data_v2[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,
@@ -1292,6 +1320,10 @@ static struct msm_vidc_common_data holi_common_data[] = {
 		.key = "qcom,never-unload-fw",
 		.value = 1,
 	},
+	{
+		.key = "qcom,fw-unload-delay",
+		.value = 1000,
+	},
 	{
 		.key = "qcom,sw-power-collapse",
 		.value = 1,