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

Commit ea3dcaa1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: arm: msm: Add video configs for msm8937"

parents 6acb6f98 84125f30

arch/arm/configs/msm8953-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_MSM=y

arch/arm/configs/msm8953_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

drivers/media/platform/msm/vidc_3x/msm_vidc_common.c

+5 −4
Original line number Diff line number Diff line
@@ -3574,7 +3574,7 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
static void populate_frame_data(struct vidc_frame_data *data,

		const struct vb2_buffer *vb, struct msm_vidc_inst *inst)

{

	int64_t time_usec;

	u64 time_usec;

	int extra_idx;

	enum v4l2_buf_type type = vb->type;

	enum vidc_ports port = type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ?
@@ -5213,7 +5213,7 @@ int msm_comm_set_color_format(struct msm_vidc_inst *inst, 
int msm_vidc_comm_s_parm(struct msm_vidc_inst *inst, struct v4l2_streamparm *a)

{

	u32 property_id = 0;

	u64 us_per_frame = 0;

	u64 us_per_frame = 0, fps_u64 = 0;

	void *pdata;

	int rc = 0, fps = 0;

	struct hal_frame_rate frame_rate;
@@ -5251,8 +5251,9 @@ int msm_vidc_comm_s_parm(struct msm_vidc_inst *inst, struct v4l2_streamparm *a) 
		goto exit;

	}



	fps = USEC_PER_SEC;

	do_div(fps, us_per_frame);

	fps_u64 = USEC_PER_SEC;

	do_div(fps_u64, us_per_frame);

	fps = fps_u64;



	if (fps % 15 == 14 || fps % 24 == 23)

		fps = fps + 1;