diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-22 07:49:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-30 15:26:33 -0400 |
commit | 0b3e29e6d75cbfb8417f449555d40921fd656186 (patch) | |
tree | 59d024a84ea4498ded8bcbe998a77a126b2daaea /drivers/media/video | |
parent | ac4251445d7302697814351f1d9f548f5aa49342 (diff) |
V4L/DVB (5917): ivtv: improve mailbox responsiveness.
First try polling for the result of a mailbox command, then
switch to a test/sleep loop. Also reduce the sleep time from 10 ms
to 1 ms. Improves the responsiveness of the mailbox handling.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-mailbox.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.c b/drivers/media/video/ivtv/ivtv-mailbox.c index 814a673712b3..5e3b679202ae 100644 --- a/drivers/media/video/ivtv/ivtv-mailbox.c +++ b/drivers/media/video/ivtv/ivtv-mailbox.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #define API_HIGH_VOL (1 << 5) /* High volume command (i.e. called during encoding or decoding) */ | 40 | #define API_HIGH_VOL (1 << 5) /* High volume command (i.e. called during encoding or decoding) */ |
41 | #define API_NO_WAIT_MB (1 << 4) /* Command may not wait for a free mailbox */ | 41 | #define API_NO_WAIT_MB (1 << 4) /* Command may not wait for a free mailbox */ |
42 | #define API_NO_WAIT_RES (1 << 5) /* Command may not wait for the result */ | 42 | #define API_NO_WAIT_RES (1 << 5) /* Command may not wait for the result */ |
43 | #define API_NO_POLL (1 << 6) /* Avoid pointless polling */ | ||
43 | 44 | ||
44 | struct ivtv_api_info { | 45 | struct ivtv_api_info { |
45 | int flags; /* Flags, see above */ | 46 | int flags; /* Flags, see above */ |
@@ -51,7 +52,7 @@ struct ivtv_api_info { | |||
51 | static const struct ivtv_api_info api_info[256] = { | 52 | static const struct ivtv_api_info api_info[256] = { |
52 | /* MPEG encoder API */ | 53 | /* MPEG encoder API */ |
53 | API_ENTRY(CX2341X_ENC_PING_FW, API_FAST_RESULT), | 54 | API_ENTRY(CX2341X_ENC_PING_FW, API_FAST_RESULT), |
54 | API_ENTRY(CX2341X_ENC_START_CAPTURE, API_RESULT), | 55 | API_ENTRY(CX2341X_ENC_START_CAPTURE, API_RESULT | API_NO_POLL), |
55 | API_ENTRY(CX2341X_ENC_STOP_CAPTURE, API_RESULT), | 56 | API_ENTRY(CX2341X_ENC_STOP_CAPTURE, API_RESULT), |
56 | API_ENTRY(CX2341X_ENC_SET_AUDIO_ID, API_CACHE), | 57 | API_ENTRY(CX2341X_ENC_SET_AUDIO_ID, API_CACHE), |
57 | API_ENTRY(CX2341X_ENC_SET_VIDEO_ID, API_CACHE), | 58 | API_ENTRY(CX2341X_ENC_SET_VIDEO_ID, API_CACHE), |
@@ -96,7 +97,7 @@ static const struct ivtv_api_info api_info[256] = { | |||
96 | 97 | ||
97 | /* MPEG decoder API */ | 98 | /* MPEG decoder API */ |
98 | API_ENTRY(CX2341X_DEC_PING_FW, API_FAST_RESULT), | 99 | API_ENTRY(CX2341X_DEC_PING_FW, API_FAST_RESULT), |
99 | API_ENTRY(CX2341X_DEC_START_PLAYBACK, API_RESULT), | 100 | API_ENTRY(CX2341X_DEC_START_PLAYBACK, API_RESULT | API_NO_POLL), |
100 | API_ENTRY(CX2341X_DEC_STOP_PLAYBACK, API_RESULT), | 101 | API_ENTRY(CX2341X_DEC_STOP_PLAYBACK, API_RESULT), |
101 | API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED, API_RESULT), | 102 | API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED, API_RESULT), |
102 | API_ENTRY(CX2341X_DEC_STEP_VIDEO, API_RESULT), | 103 | API_ENTRY(CX2341X_DEC_STEP_VIDEO, API_RESULT), |
@@ -290,6 +291,13 @@ static int ivtv_api_call(struct ivtv *itv, int cmd, int args, u32 data[]) | |||
290 | /* Get results */ | 291 | /* Get results */ |
291 | then = jiffies; | 292 | then = jiffies; |
292 | 293 | ||
294 | if (!(flags & API_NO_POLL)) { | ||
295 | /* First try to poll, then switch to delays */ | ||
296 | for (i = 0; i < 100; i++) { | ||
297 | if (readl(&mbox->flags) & IVTV_MBOX_FIRMWARE_DONE) | ||
298 | break; | ||
299 | } | ||
300 | } | ||
293 | while (!(readl(&mbox->flags) & IVTV_MBOX_FIRMWARE_DONE)) { | 301 | while (!(readl(&mbox->flags) & IVTV_MBOX_FIRMWARE_DONE)) { |
294 | if (jiffies - then > api_timeout) { | 302 | if (jiffies - then > api_timeout) { |
295 | IVTV_DEBUG_WARN("Could not get result (%s)\n", api_info[cmd].name); | 303 | IVTV_DEBUG_WARN("Could not get result (%s)\n", api_info[cmd].name); |
@@ -301,7 +309,7 @@ static int ivtv_api_call(struct ivtv *itv, int cmd, int args, u32 data[]) | |||
301 | if (flags & API_NO_WAIT_RES) | 309 | if (flags & API_NO_WAIT_RES) |
302 | mdelay(1); | 310 | mdelay(1); |
303 | else | 311 | else |
304 | ivtv_msleep_timeout(10, 0); | 312 | ivtv_msleep_timeout(1, 0); |
305 | } | 313 | } |
306 | if (jiffies - then > msecs_to_jiffies(100)) | 314 | if (jiffies - then > msecs_to_jiffies(100)) |
307 | IVTV_DEBUG_WARN("%s took %u jiffies\n", | 315 | IVTV_DEBUG_WARN("%s took %u jiffies\n", |