shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: vcodec: fix reboot crash when playing

Browse Source 
shutdown function need wait last irq finish and then continue
its work.

Change-Id: I12bed04f6eeac1f12eedf55a09699be49fb4ac35
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
This commit is contained in:
Jung Zhao
2017-01-10 14:53:40 +08:00
committed by Huang, Tao
parent aa4ac52a97
commit 62630ade2f
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@@ -39,6 +39,7 @@
#include <linux/uaccess.h>
#include <linux/debugfs.h>
#include <linux/pm_runtime.h>
#include <linux/iopoll.h>
#include <linux/rockchip/cru.h>
#include <linux/rockchip/pmu.h>
@@ -2636,6 +2637,8 @@ static void vcodec_shutdown(struct platform_device *pdev)
{
struct vpu_subdev_data *data = platform_get_drvdata(pdev);
struct vpu_service_info *pservice = data->pservice;
int val;
int ret;
dev_info(&pdev->dev, "vcodec shutdown");
@@ -2643,6 +2646,12 @@ static void vcodec_shutdown(struct platform_device *pdev)
atomic_set(&pservice->service_on, 0);
mutex_unlock(&pservice->shutdown_lock);
ret = readx_poll_timeout(atomic_read,
&pservice->total_running,
val, val == 0, 20000, 200000);
if (ret == -ETIMEDOUT)
dev_err(&pdev->dev, "wait total running time out\n");
vcodec_exit_mode(data);
vpu_service_power_on(data, pservice);