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

Commit 4130eabc authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: added missing end-of-lines in debug messages 



Many debug messages missed end-of-line.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 69c9fe6f

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

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ 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");

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



	s5p_mfc_clear_int_flags(dev);

	ctx->int_type = reason;

drivers/media/platform/s5p-mfc/s5p_mfc_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ extern int debug; 
#define mfc_debug(level, fmt, args...)

#endif



#define mfc_debug_enter() mfc_debug(5, "enter")

#define mfc_debug_leave() mfc_debug(5, "leave")

#define mfc_debug_enter() mfc_debug(5, "enter\n")

#define mfc_debug_leave() mfc_debug(5, "leave\n")



#define mfc_err(fmt, args...)				\

	do {						\

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

+8 −8
Original line number Diff line number Diff line
@@ -719,9 +719,9 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) 


	slice_type = s5p_mfc_hw_call(dev->mfc_ops, get_enc_slice_type, dev);

	strm_size = s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size, dev);

	mfc_debug(2, "Encoded slice type: %d", slice_type);

	mfc_debug(2, "Encoded stream size: %d", strm_size);

	mfc_debug(2, "Display order: %d",

	mfc_debug(2, "Encoded slice type: %d\n", slice_type);

	mfc_debug(2, "Encoded stream size: %d\n", strm_size);

	mfc_debug(2, "Display order: %d\n",

		  mfc_read(dev, S5P_FIMV_ENC_SI_PIC_CNT));

	spin_lock_irqsave(&dev->irqlock, flags);

	if (slice_type >= 0) {
@@ -1546,14 +1546,14 @@ int vidioc_encoder_cmd(struct file *file, void *priv, 


		spin_lock_irqsave(&dev->irqlock, flags);

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

			mfc_debug(2, "EOS: empty src queue, entering finishing state");

			mfc_debug(2, "EOS: empty src queue, entering finishing state\n");

			ctx->state = MFCINST_FINISHING;

			if (s5p_mfc_ctx_ready(ctx))

				set_work_bit_irqsave(ctx);

			spin_unlock_irqrestore(&dev->irqlock, flags);

			s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);

		} else {

			mfc_debug(2, "EOS: marking last buffer of stream");

			mfc_debug(2, "EOS: marking last buffer of stream\n");

			buf = list_entry(ctx->src_queue.prev,

						struct s5p_mfc_buf, list);

			if (buf->flags & MFC_BUF_FLAG_USED)
@@ -1622,7 +1622,7 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb) 
			mfc_err("failed to get plane cookie\n");

			return -EINVAL;

		}

		mfc_debug(2, "index: %d, plane[%d] cookie: 0x%08zx",

		mfc_debug(2, "index: %d, plane[%d] cookie: 0x%08zx\n",

			  vb->v4l2_buf.index, i,

			  vb2_dma_contig_plane_dma_addr(vb, i));

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx) 
	spin_unlock_irqrestore(&dev->irqlock, flags);

	dev->curr_ctx = ctx->num;

	s5p_mfc_clean_ctx_int_flags(ctx);

	mfc_debug(2, "encoding buffer with index=%d state=%d",

	mfc_debug(2, "encoding buffer with index=%d state=%d\n",

		  src_mb ? src_mb->b->v4l2_buf.index : -1, ctx->state);

	s5p_mfc_encode_one_frame_v5(ctx);

	return 0;

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

+8 −8
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct s5p_mfc_ctx *ctx, 
	WRITEL(addr, S5P_FIMV_E_STREAM_BUFFER_ADDR_V6); /* 16B align */

	WRITEL(size, S5P_FIMV_E_STREAM_BUFFER_SIZE_V6);



	mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d",

	mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n",

		  addr, size);



	return 0;
@@ -456,8 +456,8 @@ static void s5p_mfc_set_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx, 
	WRITEL(y_addr, S5P_FIMV_E_SOURCE_LUMA_ADDR_V6); /* 256B align */

	WRITEL(c_addr, S5P_FIMV_E_SOURCE_CHROMA_ADDR_V6);



	mfc_debug(2, "enc src y buf addr: 0x%08lx", y_addr);

	mfc_debug(2, "enc src c buf addr: 0x%08lx", c_addr);

	mfc_debug(2, "enc src y buf addr: 0x%08lx\n", y_addr);

	mfc_debug(2, "enc src c buf addr: 0x%08lx\n", c_addr);

}



static void s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx,
@@ -472,8 +472,8 @@ static void s5p_mfc_get_enc_frame_buffer_v6(struct s5p_mfc_ctx *ctx, 
	enc_recon_y_addr = READL(S5P_FIMV_E_RECON_LUMA_DPB_ADDR_V6);

	enc_recon_c_addr = READL(S5P_FIMV_E_RECON_CHROMA_DPB_ADDR_V6);



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

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

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

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

}



/* Set encoding ref & codec buffer */
@@ -1424,8 +1424,8 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx) 
	src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 0);

	src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 1);



	mfc_debug(2, "enc src y addr: 0x%08lx", src_y_addr);

	mfc_debug(2, "enc src c addr: 0x%08lx", src_c_addr);

	mfc_debug(2, "enc src y addr: 0x%08lx\n", src_y_addr);

	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);