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

osd: replace the timeout number with msecs_to_jiffies

Browse Source 
PD#150542: replace the timeout number with msecs_to_jiffies
1. osd: replace the timeout number with msecs_to_jiffies
2. ge2d: replace the timeout number with msecs_to_jiffies

Change-Id: I5f0032076f305932b0636742db37f537e34b4962
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
This commit is contained in:
Pengcheng Chen
2017-11-02 10:34:17 +08:00
parent b9f554f6e6
commit f109793251
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/amlogic/media/common/ge2d/ge2d_wq.c
View File

@@ -319,7 +319,7 @@ static int ge2d_process_work_queue(struct ge2d_context_s *wq)
timeout = wait_event_interruptible_timeout(
ge2d_manager.event.cmd_complete,
!ge2d_is_busy(),
100);
msecs_to_jiffies(1000));
if (timeout == 0) {
ge2d_log_err("ge2d timeout!!!\n");
ge2d_dump_cmd(&pitem->cmd);

9
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -957,7 +957,7 @@ void osd_wait_vsync_hw(void)
if (pxp_mode)
timeout = msecs_to_jiffies(50);
else
timeout = HZ;
timeout = msecs_to_jiffies(1000);
wait_event_interruptible_timeout(
osd_vsync_wq, vsync_hit, timeout);
}
@@ -965,9 +965,12 @@ void osd_wait_vsync_hw(void)
s32 osd_wait_vsync_event(void)
{
unsigned long timeout;
vsync_hit = false;
/* waiting for 10ms. */
wait_event_interruptible_timeout(osd_vsync_wq, vsync_hit, 1);
/* waiting for 1000ms. */
timeout = msecs_to_jiffies(1000);
wait_event_interruptible_timeout(osd_vsync_wq, vsync_hit, timeout);
return 0;
}

6
drivers/amlogic/media/osd_ext/osd_hw.c
View File

@@ -536,13 +536,15 @@ void osd_ext_wait_vsync_hw(void)
{
vsync_hit = false;
wait_event_interruptible_timeout(osd_ext_vsync_wq, vsync_hit, HZ);
wait_event_interruptible_timeout(osd_ext_vsync_wq,
vsync_hit, msecs_to_jiffies(1000));
}
s32 osd_ext_wait_vsync_event(void)
{
vsync_hit = false;
wait_event_interruptible_timeout(osd_ext_vsync_wq, vsync_hit, 1);
wait_event_interruptible_timeout(osd_ext_vsync_wq,
vsync_hit, msecs_to_jiffies(1000));
return 0;
}