Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96c57776 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: end-of-stream handling for newer encoders 



MFC encoder supports end-of-stream handling for encoder
in version 5 of hardware. This patch adds it also for newer version.
It was successfully tested on MFC-v8.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f6375eaf

drivers/media/platform/s5p-mfc/s5p_mfc.c

+12 −13
Original line number Diff line number Diff line
@@ -181,13 +181,6 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) 
		mutex_unlock(&dev->mfc_mutex);

}



static void s5p_mfc_clear_int_flags(struct s5p_mfc_dev *dev)

{

	mfc_write(dev, 0, S5P_FIMV_RISC_HOST_INT);

	mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD);

	mfc_write(dev, 0xffff, S5P_FIMV_SI_RTN_CHID);

}



static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)

{

	struct s5p_mfc_buf *dst_buf;
@@ -579,17 +572,13 @@ static void s5p_mfc_handle_init_buffers(struct s5p_mfc_ctx *ctx, 
	}

}



static void s5p_mfc_handle_stream_complete(struct s5p_mfc_ctx *ctx,

				 unsigned int reason, unsigned int err)

static void s5p_mfc_handle_stream_complete(struct s5p_mfc_ctx *ctx)

{

	struct s5p_mfc_dev *dev = ctx->dev;

	struct s5p_mfc_buf *mb_entry;



	mfc_debug(2, "Stream completed\n");



	s5p_mfc_clear_int_flags(dev);

	ctx->int_type = reason;

	ctx->int_err = err;

	ctx->state = MFCINST_FINISHED;



	spin_lock(&dev->irqlock);
@@ -646,6 +635,13 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv) 
		if (ctx->c_ops->post_frame_start) {

			if (ctx->c_ops->post_frame_start(ctx))

				mfc_err("post_frame_start() failed\n");



			if (ctx->state == MFCINST_FINISHING &&

						list_empty(&ctx->ref_queue)) {

				s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);

				s5p_mfc_handle_stream_complete(ctx);

				break;

			}

			s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);

			wake_up_ctx(ctx, reason, err);

			WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
@@ -691,7 +687,10 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv) 
		break;



	case S5P_MFC_R2H_CMD_COMPLETE_SEQ_RET:

		s5p_mfc_handle_stream_complete(ctx, reason, err);

		s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);

		ctx->int_type = reason;

		ctx->int_err = err;

		s5p_mfc_handle_stream_complete(ctx);

		break;



	case S5P_MFC_R2H_CMD_DPB_FLUSH_RET:

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

+3 −2
Original line number Diff line number Diff line
@@ -907,9 +907,9 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) 
			list_add_tail(&mb_entry->list, &ctx->ref_queue);

			ctx->ref_queue_cnt++;

		}

	}

	mfc_debug(2, "enc src count: %d, enc ref count: %d\n",

		  ctx->src_queue_cnt, ctx->ref_queue_cnt);

	}

	if ((ctx->dst_queue_cnt > 0) && (strm_size > 0)) {

		mb_entry = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf,

									list);
@@ -932,6 +932,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) 
	spin_unlock_irqrestore(&dev->irqlock, flags);

	if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0))

		clear_work_bit(ctx);



	return 0;

}

drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c

+33 −16
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx, 
	enc_recon_y_addr = readl(mfc_regs->e_recon_luma_dpb_addr);

	enc_recon_c_addr = readl(mfc_regs->e_recon_chroma_dpb_addr);



	mfc_debug(2, "recon y addr: 0x%08lx\n", enc_recon_y_addr);

	mfc_debug(2, "recon y addr: 0x%08lx y_addr: 0x%08lx\n", enc_recon_y_addr, *y_addr);

	mfc_debug(2, "recon c addr: 0x%08lx\n", enc_recon_c_addr);

}
@@ -1483,6 +1483,7 @@ static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx) 
{

	struct s5p_mfc_dev *dev = ctx->dev;

	const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;

	int cmd;



	mfc_debug(2, "++\n");
@@ -1493,9 +1494,13 @@ static int s5p_mfc_encode_one_frame_v6(struct s5p_mfc_ctx *ctx) 


	s5p_mfc_set_slice_mode(ctx);



	if (ctx->state != MFCINST_FINISHING)

		cmd = S5P_FIMV_CH_FRAME_START_V6;

	else

		cmd = S5P_FIMV_CH_LAST_FRAME_V6;



	writel(ctx->inst_no, mfc_regs->instance_id);

	s5p_mfc_hw_call_void(dev->mfc_cmds, cmd_host2risc, dev,

			S5P_FIMV_CH_FRAME_START_V6, NULL);

	s5p_mfc_hw_call_void(dev->mfc_cmds, cmd_host2risc, dev, cmd, NULL);



	mfc_debug(2, "--\n");
@@ -1592,7 +1597,7 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx) 


	spin_lock_irqsave(&dev->irqlock, flags);



	if (list_empty(&ctx->src_queue)) {

	if (list_empty(&ctx->src_queue) && ctx->state != MFCINST_FINISHING) {

		mfc_debug(2, "no src buffers.\n");

		spin_unlock_irqrestore(&dev->irqlock, flags);

		return -EAGAIN;
@@ -1604,8 +1609,17 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx) 
		return -EAGAIN;

	}



	if (list_empty(&ctx->src_queue)) {

		/* send null frame */

		s5p_mfc_set_enc_frame_buffer_v6(ctx, 0, 0);

		src_mb = NULL;

	} else {

		src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);

		src_mb->flags |= MFC_BUF_FLAG_USED;

		if (src_mb->b->vb2_buf.planes[0].bytesused == 0) {

			s5p_mfc_set_enc_frame_buffer_v6(ctx, 0, 0);

			ctx->state = MFCINST_FINISHING;

		} else {

			src_y_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 0);

			src_c_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 1);
@@ -1613,6 +1627,10 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx) 
			mfc_debug(2, "enc src c addr: 0x%08lx\n", src_c_addr);



			s5p_mfc_set_enc_frame_buffer_v6(ctx, src_y_addr, src_c_addr);

			if (src_mb->flags & MFC_BUF_FLAG_EOS)

				ctx->state = MFCINST_FINISHING;

		}

	}



	dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);

	dst_mb->flags |= MFC_BUF_FLAG_USED;
@@ -1639,8 +1657,7 @@ static inline void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx) 
	spin_lock_irqsave(&dev->irqlock, flags);

	mfc_debug(2, "Preparing to init decoding.\n");

	temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);

	mfc_debug(2, "Header size: %d\n",

		temp_vb->b->vb2_buf.planes[0].bytesused);

	mfc_debug(2, "Header size: %d\n", temp_vb->b->vb2_buf.planes[0].bytesused);

	s5p_mfc_set_dec_stream_buffer_v6(ctx,

		vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0), 0,

			temp_vb->b->vb2_buf.planes[0].bytesused);