Commit 4914425e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: coda/venus/s5p_mfc: fix control typo 



These two slice modes used by the V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE
control had a silly typo:

V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES

SICE should be SLICE.

Rename these enum values, keeping the old ones (under #ifndef __KERNEL__)
for backwards compatibility reasons.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1e0566fd

drivers/media/platform/coda/coda-bit.c

+2 −2
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static int coda_start_encoding(struct coda_ctx *ctx) 
		case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:

			value = 0;

			break;

		case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:

		case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB:

			value  = (ctx->params.slice_max_mb &

				  CODA_SLICING_SIZE_MASK)

				 << CODA_SLICING_SIZE_OFFSET;
@@ -1051,7 +1051,7 @@ static int coda_start_encoding(struct coda_ctx *ctx) 
				 << CODA_SLICING_UNIT_OFFSET;

			value |=  1 & CODA_SLICING_MODE_MASK;

			break;

		case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:

		case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES:

			value  = (ctx->params.slice_max_bits &

				  CODA_SLICING_SIZE_MASK)

				 << CODA_SLICING_SIZE_OFFSET;

drivers/media/platform/coda/coda-common.c

+1 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ static void coda_encode_ctrls(struct coda_ctx *ctx) 
	}

	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,

		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x0,

		V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, 0x0,

		V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);

drivers/media/platform/qcom/venus/venc_ctrls.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ int venc_ctrl_init(struct venus_inst *inst) 


	v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,

		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES,

		V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,

		0, V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);



	v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static struct mfc_control controls[] = { 
		.id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,

		.maximum = V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES,

		.maximum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,

		.default_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,

		.menu_skip_mask = 0,

	},

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

+2 −2
Original line number Diff line number Diff line
@@ -695,9 +695,9 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx) 
	/* multi-slice control */

	/* multi-slice MB number or bit size */

	mfc_write(dev, p->slice_mode, S5P_FIMV_ENC_MSLICE_CTRL);

	if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {

	if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {

		mfc_write(dev, p->slice_mb, S5P_FIMV_ENC_MSLICE_MB);

	} else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {

	} else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {

		mfc_write(dev, p->slice_bit, S5P_FIMV_ENC_MSLICE_BIT);

	} else {

		mfc_write(dev, 0, S5P_FIMV_ENC_MSLICE_MB);

CRA Git | Maintained and supported by SUSTech CRA and CCSE