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

Commit 9ab10e46 authored by Arun Kumar K's avatar Arun Kumar K Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Add init buffer cmd to MFCV6 



Latest MFC v6 firmware requires tile mode and loop filter
setting to be done as part of Init buffer command, in sync
with v7. This patch adds this support for new v6 firmware.

Signed-off-by: default avatarArun Kumar K <arun.kk@samsung.com>
Signed-off-by: default avatarKiran AVND <avnd.kiran@samsung.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 77ba6b73

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

+4 −2
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#define WRITEL(data, reg) \

	(WARN_ON_ONCE(!(reg)) ? 0 : writel((data), (reg)))



#define IS_MFCV6_V2(dev) (!IS_MFCV7_PLUS(dev) && dev->fw_ver == MFC_FW_V2)



/* Allocate temporary buffers for decoding */

static int s5p_mfc_alloc_dec_temp_buffers_v6(struct s5p_mfc_ctx *ctx)

{
@@ -1352,7 +1354,7 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx) 
		WRITEL(ctx->display_delay, mfc_regs->d_display_delay);

	}



	if (IS_MFCV7_PLUS(dev)) {

	if (IS_MFCV7_PLUS(dev) || IS_MFCV6_V2(dev)) {

		WRITEL(reg, mfc_regs->d_dec_options);

		reg = 0;

	}
@@ -1367,7 +1369,7 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx) 
	if (ctx->dst_fmt->fourcc == V4L2_PIX_FMT_NV12MT_16X16)

		reg |= (0x1 << S5P_FIMV_D_OPT_TILE_MODE_SHIFT_V6);



	if (IS_MFCV7_PLUS(dev))

	if (IS_MFCV7_PLUS(dev) || IS_MFCV6_V2(dev))

		WRITEL(reg, mfc_regs->d_init_buffer_options);

	else

		WRITEL(reg, mfc_regs->d_dec_options);