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

video: rockchip: mpp: fix hw hang issue

Browse Source 
When the CPU is busy, there may be a situation:
1. After the software timeout task of the current task is mounted
2. Than the thread is cut away for too long, and the hardware is
   not configured at this time,
3. The software timeout is triggered to go to reset and poweroff.
4. The thread switches back to configure the hardware
5. The hardware is stuck.

Solution:
In the software timeout processing function, judge whether the hardware
at this time has been configured to start.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I00c0794bb2f27690ab8a2341b3bee2d3f942adf8
This commit is contained in:
Yandong Lin
2021-08-06 15:43:29 +08:00
committed by Tao Huang
parent 6ecd6c18bc
commit a112273253
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/rockchip/mpp/mpp_common.c
View File

@@ -452,8 +452,10 @@ static void mpp_task_timeout_work(struct work_struct *work_s)
struct mpp_task,
timeout_work);
if (test_and_set_bit(TASK_STATE_HANDLE, &task->state)) {
mpp_err("task has been handled\n");
if (!test_bit(TASK_STATE_START, &task->state)) {
mpp_err("task has not start\n");
schedule_delayed_work(&task->timeout_work,
msecs_to_jiffies(MPP_WORK_TIMEOUT_DELAY));
return;
}
@@ -470,6 +472,13 @@ static void mpp_task_timeout_work(struct work_struct *work_s)
}
mpp = session->mpp;
synchronize_hardirq(mpp->irq);
if (test_and_set_bit(TASK_STATE_HANDLE, &task->state)) {
mpp_err("task has been handled\n");
return;
}
/* hardware maybe dead, reset it */
mpp_reset_up_read(mpp->reset_group);
mpp_dev_reset(mpp);
@@ -674,11 +683,11 @@ static int mpp_task_run(struct mpp_dev *mpp,
*/
mpp_reset_down_read(mpp->reset_group);
set_bit(TASK_STATE_START, &task->state);
schedule_delayed_work(&task->timeout_work,
msecs_to_jiffies(MPP_WORK_TIMEOUT_DELAY));
if (mpp->dev_ops->run)
mpp->dev_ops->run(mpp, task);
set_bit(TASK_STATE_START, &task->state);
mpp_debug_leave();