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

Commit c112429e authored by Deva Ramasubramanian's avatar Deva Ramasubramanian
Browse files

msm: vidc: Don't set `step` for MENU type controls 



It triggers a WARN_ON in drivers/media/v4l2-core/v4l2-ctrls.c:1728

Signed-off-by: default avatarDeva Ramasubramanian <dramasub@codeaurora.org>
Change-Id: I747cc64cb7ce17ba34d669a105982864c350e11c
parent fd854d74

drivers/media/platform/msm/vidc/msm_vdec.c

+0 −8
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		(1 << V4L2_MPEG_VIDC_VIDEO_NAL_FORMAT_FOUR_BYTE_LENGTH)

		),

		.qmenu = mpeg_video_stream_format,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_OUTPUT_ORDER,
@@ -166,7 +165,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_OUTPUT_ORDER_DECODE)

			),

		.qmenu = mpeg_video_output_order,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_PICTURE_TYPE,
@@ -214,7 +212,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_DIVX_FORMAT_6)

			),

		.qmenu = mpeg_video_vidc_divx_format,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MB_ERROR_MAP_REPORTING,
@@ -288,7 +285,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO)

			),

		.qmenu = mpeg_video_vidc_extradata,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL,
@@ -301,7 +297,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_CID_MPEG_VIDC_PERF_LEVEL_NOMINAL) |

			(1 << V4L2_CID_MPEG_VIDC_PERF_LEVEL_TURBO)),

		.qmenu = perf_level,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_ALLOC_MODE_INPUT,
@@ -316,7 +311,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_DYNAMIC)

			),

		.qmenu = mpeg_vidc_video_alloc_mode_type,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_ALLOC_MODE_OUTPUT,
@@ -331,7 +325,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_DYNAMIC)

			),

		.qmenu = mpeg_vidc_video_alloc_mode_type,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_FRAME_ASSEMBLY,
@@ -567,7 +560,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_DPB_COLOR_FMT_TP10_UBWC)

			),

		.qmenu = mpeg_vidc_video_dpb_color_format,

		.step = 0,

	},

};

drivers/media/platform/msm/vidc/msm_venc.c

+0 −16
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC,

		.maximum = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC,

		.default_value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC,

		.step = 0,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC) |

		(1 << V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC)
@@ -319,7 +318,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_0,

		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_1,

		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_0,

		.step = 0,

		.menu_skip_mask = ~(

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_0) |

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_1) |
@@ -334,7 +332,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,

		.maximum = CODING,

		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,

		.step = 1,

		.menu_skip_mask = 0,

	},

	{
@@ -344,7 +341,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_MPEG4_LEVEL_0,

		.maximum = V4L2_MPEG_VIDEO_MPEG4_LEVEL_5,

		.default_value = V4L2_MPEG_VIDEO_MPEG4_LEVEL_0,

		.step = 1,

		.menu_skip_mask = 0,

	},

	{
@@ -354,7 +350,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,

		.maximum = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH,

		.default_value = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,

		.step = 1,

		.menu_skip_mask = 0,

	},

	{
@@ -364,7 +359,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_5_2,

		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.step = 0,

		.menu_skip_mask = 0,

	},

	{
@@ -426,7 +420,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN,

		.maximum = V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN_STILL_PIC,

		.default_value = V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN,

		.step = 0,

		.menu_skip_mask =  ~(

		(1 << V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN) |

		(1 << V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN10) |
@@ -442,7 +435,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDC_VIDEO_HEVC_LEVEL_HIGH_TIER_LEVEL_6_2,

		.default_value =

			V4L2_MPEG_VIDC_VIDEO_HEVC_LEVEL_MAIN_TIER_LEVEL_1,

		.step = 0,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDC_VIDEO_HEVC_LEVEL_HIGH_TIER_LEVEL_1) |

		(1 << V4L2_MPEG_VIDC_VIDEO_HEVC_LEVEL_HIGH_TIER_LEVEL_2) |
@@ -472,7 +464,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_NONE,

		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_270,

		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_NONE,

		.step = 0,

		.menu_skip_mask = ~(

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_NONE) |

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_90) |
@@ -561,7 +552,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,

		.maximum = V4L2_MPEG_VIDEO_MULTI_SLICE_GOB,

		.default_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,

		.step = 1,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) |

		(1 << V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) |
@@ -620,7 +610,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_NONE,

		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_RANDOM,

		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_NONE,

		.step = 0,

		.menu_skip_mask = ~(

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_NONE) |

		(1 << V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_CYCLIC) |
@@ -692,7 +681,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.minimum = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED,

		.maximum = L_MODE,

		.default_value = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED,

		.step = 1,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED) |

		(1 << V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED) |
@@ -707,7 +695,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_I_FRAME,

		.default_value =

			V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_I_FRAME,

		.step = 1,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) |

		(1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_I_FRAME)
@@ -752,7 +739,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI)

			),

		.qmenu = mpeg_video_vidc_extradata,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO,
@@ -785,7 +771,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_CID_MPEG_VIDC_PERF_LEVEL_NOMINAL) |

			(1 << V4L2_CID_MPEG_VIDC_PERF_LEVEL_TURBO)),

		.qmenu = perf_level,

		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB,
@@ -1082,7 +1067,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_CID_MPEG_VIDC_VIDEO_MBI_MODE_1) |

			(1 << V4L2_CID_MPEG_VIDC_VIDEO_MBI_MODE_2)),

		.qmenu = mbi_statistics,

		.step = 1,

	},

};