renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 23:23:52 +08:00
Code

[media] s5p-mfc: make queue cleanup code common

Browse Source 
Code for queue cleanup has nothing specific to hardware version.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Andrzej Hajda 2015-12-02 06:22:29 -02:00 committed by Mauro Carvalho Chehab
parent 05d1d0f020
commit 62bbd72b09
7 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/platform/s5p-mfc/s5p_mfc.c
View File

@ -125,6 +125,20 @@ static void wake_up_dev(struct s5p_mfc_dev *dev, unsigned int reason,
wake_up(&dev->queue); wake_up(&dev->queue);
} }
void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq)
{
struct s5p_mfc_buf *b;
int i;
while (!list_empty(lh)) {
b = list_entry(lh->next, struct s5p_mfc_buf, list);
for (i = 0; i < b->b->vb2_buf.num_planes; i++)
vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&b->list);
}
}
static void s5p_mfc_watchdog(unsigned long arg) static void s5p_mfc_watchdog(unsigned long arg)
{ {
struct s5p_mfc_dev *dev = (struct s5p_mfc_dev *)arg; struct s5p_mfc_dev *dev = (struct s5p_mfc_dev *)arg;
@ -170,10 +184,8 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
if (!ctx) if (!ctx)
continue; continue;
ctx->state = MFCINST_ERROR; ctx->state = MFCINST_ERROR;
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->dst_queue, &ctx->vq_dst);
&ctx->dst_queue, &ctx->vq_dst); s5p_mfc_cleanup_queue(&ctx->src_queue, &ctx->vq_src);
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue,
&ctx->src_queue, &ctx->vq_src);
clear_work_bit(ctx); clear_work_bit(ctx);
wake_up_ctx(ctx, S5P_MFC_R2H_CMD_ERR_RET, 0); wake_up_ctx(ctx, S5P_MFC_R2H_CMD_ERR_RET, 0);
} }
@ -471,11 +483,9 @@ static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev,
ctx->state = MFCINST_ERROR; ctx->state = MFCINST_ERROR;
/* Mark all dst buffers as having an error */ /* Mark all dst buffers as having an error */
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->dst_queue, &ctx->vq_dst);
&ctx->dst_queue, &ctx->vq_dst);
/* Mark all src buffers as having an error */ /* Mark all src buffers as having an error */
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->src_queue, &ctx->vq_src);
&ctx->src_queue, &ctx->vq_src);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
wake_up_ctx(ctx, reason, err); wake_up_ctx(ctx, reason, err);
break; break;

1
drivers/media/platform/s5p-mfc/s5p_mfc_common.h
View File

@ -711,6 +711,7 @@ void set_work_bit(struct s5p_mfc_ctx *ctx);
void clear_work_bit_irqsave(struct s5p_mfc_ctx *ctx); void clear_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx); void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev); int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev);
void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq);
#define HAS_PORTNUM(dev) (dev ? (dev->variant ? \ #define HAS_PORTNUM(dev) (dev ? (dev->variant ? \
(dev->variant->port_num ? 1 : 0) : 0) : 0) (dev->variant->port_num ? 1 : 0) : 0) : 0)

6
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
View File

@ -1033,8 +1033,7 @@ static void s5p_mfc_stop_streaming(struct vb2_queue *q)
} }
if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->dst_queue, &ctx->vq_dst);
&ctx->dst_queue, &ctx->vq_dst);
INIT_LIST_HEAD(&ctx->dst_queue); INIT_LIST_HEAD(&ctx->dst_queue);
ctx->dst_queue_cnt = 0; ctx->dst_queue_cnt = 0;
ctx->dpb_flush_flag = 1; ctx->dpb_flush_flag = 1;
@ -1051,8 +1050,7 @@ static void s5p_mfc_stop_streaming(struct vb2_queue *q)
} }
if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->src_queue, &ctx->vq_src);
&ctx->src_queue, &ctx->vq_src);
INIT_LIST_HEAD(&ctx->src_queue); INIT_LIST_HEAD(&ctx->src_queue);
ctx->src_queue_cnt = 0; ctx->src_queue_cnt = 0;
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);

6
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
View File

@ -1989,15 +1989,13 @@ static void s5p_mfc_stop_streaming(struct vb2_queue *q)
ctx->state = MFCINST_FINISHED; ctx->state = MFCINST_FINISHED;
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, s5p_mfc_cleanup_queue(&ctx->dst_queue, &ctx->vq_dst);
&ctx->dst_queue, &ctx->vq_dst);
INIT_LIST_HEAD(&ctx->dst_queue); INIT_LIST_HEAD(&ctx->dst_queue);
ctx->dst_queue_cnt = 0; ctx->dst_queue_cnt = 0;
} }
if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
cleanup_ref_queue(ctx); cleanup_ref_queue(ctx);
s5p_mfc_hw_call_void(dev->mfc_ops, cleanup_queue, &ctx->src_queue, s5p_mfc_cleanup_queue(&ctx->src_queue, &ctx->vq_src);
&ctx->vq_src);
INIT_LIST_HEAD(&ctx->src_queue); INIT_LIST_HEAD(&ctx->src_queue);
ctx->src_queue_cnt = 0; ctx->src_queue_cnt = 0;
} }

2
drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
View File

@ -296,8 +296,6 @@ struct s5p_mfc_hw_ops {
int (*init_encode)(struct s5p_mfc_ctx *ctx); int (*init_encode)(struct s5p_mfc_ctx *ctx);
int (*encode_one_frame)(struct s5p_mfc_ctx *ctx); int (*encode_one_frame)(struct s5p_mfc_ctx *ctx);
void (*try_run)(struct s5p_mfc_dev *dev); void (*try_run)(struct s5p_mfc_dev *dev);
void (*cleanup_queue)(struct list_head *lh,
struct vb2_queue *vq);
void (*clear_int_flags)(struct s5p_mfc_dev *dev); void (*clear_int_flags)(struct s5p_mfc_dev *dev);
void (*write_info)(struct s5p_mfc_ctx *ctx, unsigned int data, void (*write_info)(struct s5p_mfc_ctx *ctx, unsigned int data,
unsigned int ofs); unsigned int ofs);

16
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
View File

@ -1451,21 +1451,6 @@ static void s5p_mfc_try_run_v5(struct s5p_mfc_dev *dev)
} }
} }
static void s5p_mfc_cleanup_queue_v5(struct list_head *lh, struct vb2_queue *vq)
{
struct s5p_mfc_buf *b;
int i;
while (!list_empty(lh)) {
b = list_entry(lh->next, struct s5p_mfc_buf, list);
for (i = 0; i < b->b->vb2_buf.num_planes; i++)
vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&b->list);
}
}
static void s5p_mfc_clear_int_flags_v5(struct s5p_mfc_dev *dev) static void s5p_mfc_clear_int_flags_v5(struct s5p_mfc_dev *dev)
{ {
mfc_write(dev, 0, S5P_FIMV_RISC_HOST_INT); mfc_write(dev, 0, S5P_FIMV_RISC_HOST_INT);
@ -1677,7 +1662,6 @@ static struct s5p_mfc_hw_ops s5p_mfc_ops_v5 = {
.init_encode = s5p_mfc_init_encode_v5, .init_encode = s5p_mfc_init_encode_v5,
.encode_one_frame = s5p_mfc_encode_one_frame_v5, .encode_one_frame = s5p_mfc_encode_one_frame_v5,
.try_run = s5p_mfc_try_run_v5, .try_run = s5p_mfc_try_run_v5,
.cleanup_queue = s5p_mfc_cleanup_queue_v5,
.clear_int_flags = s5p_mfc_clear_int_flags_v5, .clear_int_flags = s5p_mfc_clear_int_flags_v5,
.write_info = s5p_mfc_write_info_v5, .write_info = s5p_mfc_write_info_v5,
.read_info = s5p_mfc_read_info_v5, .read_info = s5p_mfc_read_info_v5,

16
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
View File

@ -1822,21 +1822,6 @@ static void s5p_mfc_try_run_v6(struct s5p_mfc_dev *dev)
} }
} }
static void s5p_mfc_cleanup_queue_v6(struct list_head *lh, struct vb2_queue *vq)
{
struct s5p_mfc_buf *b;
int i;
while (!list_empty(lh)) {
b = list_entry(lh->next, struct s5p_mfc_buf, list);
for (i = 0; i < b->b->vb2_buf.num_planes; i++)
vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&b->list);
}
}
static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev) static void s5p_mfc_clear_int_flags_v6(struct s5p_mfc_dev *dev)
{ {
const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs; const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
@ -2268,7 +2253,6 @@ static struct s5p_mfc_hw_ops s5p_mfc_ops_v6 = {
.init_encode = s5p_mfc_init_encode_v6, .init_encode = s5p_mfc_init_encode_v6,
.encode_one_frame = s5p_mfc_encode_one_frame_v6, .encode_one_frame = s5p_mfc_encode_one_frame_v6,
.try_run = s5p_mfc_try_run_v6, .try_run = s5p_mfc_try_run_v6,
.cleanup_queue = s5p_mfc_cleanup_queue_v6,
.clear_int_flags = s5p_mfc_clear_int_flags_v6, .clear_int_flags = s5p_mfc_clear_int_flags_v6,
.write_info = s5p_mfc_write_info_v6, .write_info = s5p_mfc_write_info_v6,
.read_info = s5p_mfc_read_info_v6, .read_info = s5p_mfc_read_info_v6,