DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: msm: wfd: Encode frames asynchronously

Browse Source 
The sequence of unlocking, encoding, and locking again was dangerous
since it is unpredictable when the lock can be reacquired in the input
thread. In most cases, this was fine as the encoder took long enough to
return buffers back to VSG that we were able to re-acquire the lock.
However, in cases that encoder is faster than expected, VSG receives an
EBD call back before the input thread can reacquire the lock and put the
encoded buffer into the busy queue. This causes the output thread to
complain about unexpected buffers and drop the frame, which eventually
causes 100% frame drop.

CRs-Fixed: 339432
Change-Id: I29731cfb4a51ffc8f362426d570482ad7f6394b6
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
This commit is contained in:
Deva Ramasubramanian
2012-02-28 18:48:26 -08:00
parent e9153ee743
commit fa78ea2f46
2 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/media/video/msm/wfd/vsg-subdev.c
View File

@@ -76,10 +76,29 @@ static void vsg_set_last_buffer(struct vsg_context *context,
}
}
static void vsg_encode_helper_func(struct work_struct *task)
{
struct vsg_encode_work *work =
container_of(task, struct vsg_encode_work, work);
/*
* Note: don't need to lock for context below as we only
* access fields that are "static".
*/
int rc = vsg_encode_frame(work->context, work->buf);
if (rc < 0) {
mutex_lock(&work->context->mutex);
work->context->state = VSG_STATE_ERROR;
mutex_unlock(&work->context->mutex);
}
kfree(work);
}
static void vsg_work_func(struct work_struct *task)
{
struct vsg_work *work =
container_of(task, struct vsg_work, work);
struct vsg_encode_work *encode_work;
struct vsg_context *context = work->context;
struct vsg_buf_info *buf_info = NULL, *temp = NULL;
int rc = 0;
@@ -88,8 +107,9 @@ static void vsg_work_func(struct work_struct *task)
if (list_empty(&context->free_queue.node)) {
WFD_MSG_DBG("%s: queue empty doing nothing\n", __func__);
goto err_skip_encode;
} else if (context->stopped) {
WFD_MSG_DBG("%s: vsg is stopped doing nothing\n", __func__);
} else if (context->state != VSG_STATE_STARTED) {
WFD_MSG_DBG("%s: vsg is stopped or in error state "
"doing nothing\n", __func__);
goto err_skip_encode;
}
@@ -114,15 +134,19 @@ static void vsg_work_func(struct work_struct *task)
}
}
buf_info->flags |= VSG_BUF_BEING_ENCODED;
mutex_unlock(&context->mutex);
rc = vsg_encode_frame(context, buf_info);
if (rc < 0) {
WFD_MSG_ERR("frame encode failed");
goto err_encode_fail;
encode_work = kmalloc(sizeof(*encode_work), GFP_KERNEL);
encode_work->buf = buf_info;
encode_work->context = context;
INIT_WORK(&encode_work->work, vsg_encode_helper_func);
rc = queue_work(context->work_queue, &encode_work->work);
if (!rc) {
WFD_MSG_ERR("Queueing buffer for encode failed\n");
kfree(encode_work);
encode_work = NULL;
goto err_queue_encode_fail;
}
mutex_lock(&context->mutex);
buf_info->flags |= VSG_BUF_BEING_ENCODED;
if (!(buf_info->flags & VSG_NEVER_SET_LAST_BUFFER)) {
bool is_same_buffer = context->last_buffer &&
mdp_buf_info_equals(
@@ -149,7 +173,7 @@ static void vsg_work_func(struct work_struct *task)
list_add_tail(&buf_info->node, &context->busy_queue.node);
err_skip_encode:
mutex_unlock(&context->mutex);
err_encode_fail:
err_queue_encode_fail:
kfree(work);
}
@@ -163,7 +187,7 @@ static void vsg_timer_helper_func(struct work_struct *task)
mutex_lock(&context->mutex);
if (context->stopped)
if (context->state != VSG_STATE_STARTED)
goto err_locked;
if (list_empty(&context->free_queue.node)
@@ -280,7 +304,7 @@ static int vsg_open(struct v4l2_subdev *sd, void *arg)
context->last_buffer = context->regen_buffer = NULL;
context->send_regen_buffer = false;
context->mode = DEFAULT_MODE;
context->stopped = true;
context->state = VSG_STATE_NONE;
mutex_init(&context->mutex);
sd->dev_priv = context;
@@ -312,12 +336,15 @@ static int vsg_start(struct v4l2_subdev *sd)
context = (struct vsg_context *)sd->dev_priv;
if (context->stopped == false) {
if (context->state == VSG_STATE_STARTED) {
WFD_MSG_ERR("VSG not stopped, start not allowed\n");
return -EINPROGRESS;
} else if (context->state == VSG_STATE_ERROR) {
WFD_MSG_ERR("VSG in error state, not allowed to restart\n");
return -ENOTRECOVERABLE;
}
context->stopped = false;
context->state = VSG_STATE_STARTED;
mod_timer(&context->threshold_timer, jiffies +
nsecs_to_jiffies(context->max_frame_interval));
return 0;
@@ -335,7 +362,7 @@ static int vsg_stop(struct v4l2_subdev *sd)
context = (struct vsg_context *)sd->dev_priv;
mutex_lock(&context->mutex);
context->stopped = true;
context->state = VSG_STATE_STOPPED;
{ /*delete pending buffers as we're not going to encode them*/
struct list_head *pos, *next;
list_for_each_safe(pos, next, &context->free_queue.node) {

15
drivers/media/video/msm/wfd/vsg-subdev.h
View File

@@ -34,6 +34,13 @@ enum vsg_modes {
VSG_MODE_VFR,
};
enum vsg_states {
VSG_STATE_NONE,
VSG_STATE_STARTED,
VSG_STATE_STOPPED,
VSG_STATE_ERROR
};
struct vsg_buf_info {
struct mdp_buf_info mdp_buf_info;
struct timespec time;
@@ -59,7 +66,7 @@ struct vsg_context {
struct vsg_buf_info *last_buffer, *regen_buffer;
bool send_regen_buffer;
int mode;
bool stopped;
int state;
};
struct vsg_work {
@@ -67,6 +74,12 @@ struct vsg_work {
struct work_struct work;
};
struct vsg_encode_work {
struct vsg_buf_info *buf;
struct vsg_context *context;
struct work_struct work;
};
#define VSG_OPEN _IO(VSG_MAGIC_IOCTL, 1)
#define VSG_CLOSE _IO(VSG_MAGIC_IOCTL, 2)
#define VSG_START _IO(VSG_MAGIC_IOCTL, 3)