Commit c6a86569 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: staging: rkisp1: cap: support uv swap only for semiplanar formats 



The register RKISP1_CIF_MI_XTD_FORMAT_CTRL is relevant only
for semiplanar formats, therefore the uv swap can be supported
through this register only for semiplanar formats.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b82b3993

drivers/staging/media/rkisp1/rkisp1-capture.c

+19 −12
Original line number Diff line number Diff line
@@ -383,12 +383,16 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap) 
		     cap->config->mi.cr_size_init);



	rkisp1_irq_frame_end_enable(cap);



	/* set uv swapping for semiplanar formats */

	if (cap->pix.info->comp_planes == 2) {

		reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);

		if (cap->pix.cfg->uv_swap)

			reg |= RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;

		else

			reg &= ~RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;

		rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);

	}



	rkisp1_mi_config_ctrl(cap);
@@ -421,12 +425,15 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap) 


	rkisp1_irq_frame_end_enable(cap);



	/* set uv swapping for semiplanar formats */

	if (cap->pix.info->comp_planes == 2) {

		reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);

		if (cap->pix.cfg->uv_swap)

			reg |= RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;

		else

			reg &= ~RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;

		rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);

	}



	rkisp1_mi_config_ctrl(cap);