amlvideo: reset video_inuse when amlvideo stop [1/1]

Lifeng Cao · Lifeng Cao · commit 53b26248ef71 · 2019-05-29T07:19:54.000-07:00
PD#TV-6189

Problem:
video_inuse always is 1 when codec server crash

Solution:
reset video_inuse when amlvideo stop

Verify:
TL1

Change-Id: I5b1b808668e3b2fb78781a4ea1ccbaefc3507d2b
Signed-off-by: Lifeng Cao &lt;lifeng.cao@amlogic.com&gt;
diff --git a/drivers/amlogic/media/video_processor/video_dev/amlvideo.c b/drivers/amlogic/media/video_processor/video_dev/amlvideo.c
@@ -764,6 +764,8 @@ static int amlvideo_close(struct file *file)
 	mutex_lock(&dev->mutex);
 	dev->users--;
 	mutex_unlock(&dev->mutex);
+	if (dev->inst == 0)
+		video_inuse = 0;
 	AMLVIDEO_DBG("amlvideo close");
 	return 0;
 }
diff --git a/drivers/amlogic/media/video_processor/video_dev/amlvideo.h b/drivers/amlogic/media/video_processor/video_dev/amlvideo.h
@@ -103,6 +103,7 @@ struct vivi_fh {
 	enum v4l2_buf_type type;
 };
 
+extern bool video_inuse;
 extern bool omx_secret_mode;
 extern void get_ppmgr_buf_info(char **start, unsigned int *size);
 
diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c
@@ -1116,7 +1116,7 @@ static u32 last_toggle_count;
 static u32 toggle_same_count;
 
 /* video_inuse */
-static u32 video_inuse;
+u32 video_inuse;
 
 void set_freerun_mode(int mode)
 {

Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,8 @@ static int amlvideo_close(struct file *file)`
`764`	`764`	`mutex_lock(&dev->mutex);`
`765`	`765`	`dev->users--;`
`766`	`766`	`mutex_unlock(&dev->mutex);`
	`767`	`+ if (dev->inst == 0)`
	`768`	`+ video_inuse = 0;`
`767`	`769`	`AMLVIDEO_DBG("amlvideo close");`
`768`	`770`	`return 0;`
`769`	`771`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ static u32 last_toggle_count;`
`1116`	`1116`	`static u32 toggle_same_count;`
`1117`	`1117`
`1118`	`1118`	`/* video_inuse */`
`1119`		`-static u32 video_inuse;`
	`1119`	`+u32 video_inuse;`
`1120`	`1120`
`1121`	`1121`	`void set_freerun_mode(int mode)`
`1122`	`1122`	`{`