Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: coda/venus/s5p_mfc: fix control typo

Browse Source 
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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2019-04-24 05:37:49 -04:00 committed by Mauro Carvalho Chehab
parent 1e0566fd4a
commit 4914425e28
7 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/coda/coda-bit.c
View File

@ -1043,7 +1043,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE: case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
value = 0; value = 0;
break; 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 & value = (ctx->params.slice_max_mb &
CODA_SLICING_SIZE_MASK) CODA_SLICING_SIZE_MASK)
<< CODA_SLICING_SIZE_OFFSET; << CODA_SLICING_SIZE_OFFSET;
@ -1051,7 +1051,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
<< CODA_SLICING_UNIT_OFFSET; << CODA_SLICING_UNIT_OFFSET;
value |= 1 & CODA_SLICING_MODE_MASK; value |= 1 & CODA_SLICING_MODE_MASK;
break; 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 & value = (ctx->params.slice_max_bits &
CODA_SLICING_SIZE_MASK) CODA_SLICING_SIZE_MASK)
<< CODA_SLICING_SIZE_OFFSET; << CODA_SLICING_SIZE_OFFSET;

2
drivers/media/platform/coda/coda-common.c
View File

@ -2061,7 +2061,7 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
} }
v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE, 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_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops, v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1); V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);

2
drivers/media/platform/qcom/venus/venc_ctrls.c
View File

@ -293,7 +293,7 @@ int venc_ctrl_init(struct venus_inst *inst)
v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops, v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE, 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); 0, V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops, v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,

2
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
View File

@ -134,7 +134,7 @@ static struct mfc_control controls[] = {
.id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE, .id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
.type = V4L2_CTRL_TYPE_MENU, .type = V4L2_CTRL_TYPE_MENU,
.minimum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, .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, .default_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
.menu_skip_mask = 0, .menu_skip_mask = 0,
}, },

4
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
View File

@ -695,9 +695,9 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
/* multi-slice control */ /* multi-slice control */
/* multi-slice MB number or bit size */ /* multi-slice MB number or bit size */
mfc_write(dev, p->slice_mode, S5P_FIMV_ENC_MSLICE_CTRL); 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); 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); mfc_write(dev, p->slice_bit, S5P_FIMV_ENC_MSLICE_BIT);
} else { } else {
mfc_write(dev, 0, S5P_FIMV_ENC_MSLICE_MB); mfc_write(dev, 0, S5P_FIMV_ENC_MSLICE_MB);

8
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
View File

@ -736,10 +736,10 @@ static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
/* multi-slice control */ /* multi-slice control */
/* multi-slice MB number or bit size */ /* multi-slice MB number or bit size */
writel(ctx->slice_mode, mfc_regs->e_mslice_mode); writel(ctx->slice_mode, mfc_regs->e_mslice_mode);
if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) { if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
writel(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb); writel(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
} else if (ctx->slice_mode == } else if (ctx->slice_mode ==
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) { V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
writel(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits); writel(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
} else { } else {
writel(0x0, mfc_regs->e_mslice_size_mb); writel(0x0, mfc_regs->e_mslice_size_mb);
@ -779,11 +779,11 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
/* multi-slice MB number or bit size */ /* multi-slice MB number or bit size */
ctx->slice_mode = p->slice_mode; ctx->slice_mode = p->slice_mode;
reg = 0; reg = 0;
if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) { if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
reg |= (0x1 << 3); reg |= (0x1 << 3);
writel(reg, mfc_regs->e_enc_options); writel(reg, mfc_regs->e_enc_options);
ctx->slice_size.mb = p->slice_mb; ctx->slice_size.mb = p->slice_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) {
reg |= (0x1 << 3); reg |= (0x1 << 3);
writel(reg, mfc_regs->e_enc_options); writel(reg, mfc_regs->e_enc_options);
ctx->slice_size.bits = p->slice_bit; ctx->slice_size.bits = p->slice_bit;

5
include/uapi/linux/v4l2-controls.h
View File

@ -392,8 +392,13 @@ enum v4l2_mpeg_video_header_mode {
#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE (V4L2_CID_MPEG_BASE+221) #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE (V4L2_CID_MPEG_BASE+221)
enum v4l2_mpeg_video_multi_slice_mode { enum v4l2_mpeg_video_multi_slice_mode {
V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE = 0, V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE = 0,
V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB = 1,
V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES = 2,
#ifndef __KERNEL__
/* Kept for backwards compatibility reasons. Stupid typo... */
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB = 1, V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB = 1,
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES = 2, V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES = 2,
#endif
}; };
#define V4L2_CID_MPEG_VIDEO_VBV_SIZE (V4L2_CID_MPEG_BASE+222) #define V4L2_CID_MPEG_VIDEO_VBV_SIZE (V4L2_CID_MPEG_BASE+222)
#define V4L2_CID_MPEG_VIDEO_DEC_PTS (V4L2_CID_MPEG_BASE+223) #define V4L2_CID_MPEG_VIDEO_DEC_PTS (V4L2_CID_MPEG_BASE+223)