Merge "msm: vidc: Remove artificial cap of VP8 at 1080p" (00121d91) · Commits · e / devices / android_kernel_sony_msm8994

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ int msm_vidc_debug_out = VIDC_OUT_PRINTK;
		int msm_fw_debug = 0x18;
		int msm_fw_debug_mode = 0x1;
		int msm_fw_low_power_mode = 0x1;
		int msm_vp8_low_tier = 0x1;
		int msm_vidc_hw_rsp_timeout = 1000;

		struct debug_buffer {
		@@ -155,11 +154,6 @@ struct dentry *msm_vidc_debugfs_init_drv(void)
		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
		goto failed_create_dir;
		}
		if (!debugfs_create_u32("vp8_low_tier", S_IRUGO \| S_IWUSR,
		dir, &msm_vp8_low_tier)) {
		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
		goto failed_create_dir;
		}
		if (!debugfs_create_u32("debug_output", S_IRUGO \| S_IWUSR,
		dir, &msm_vidc_debug_out)) {
		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");

+0 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ extern int msm_vidc_debug_out;
		extern int msm_fw_debug;
		extern int msm_fw_debug_mode;
		extern int msm_fw_low_power_mode;
		extern int msm_vp8_low_tier;
		extern int msm_vidc_hw_rsp_timeout;

		#define VIDC_MSG_PRIO2STRING(__level) ({ \

+0 −4

Original line number	Diff line number	Diff line
		@@ -3614,10 +3614,6 @@ int venus_hfi_capability_check(u32 fourcc, u32 width,
		return -EINVAL;
		}

		if (msm_vp8_low_tier && fourcc == V4L2_PIX_FMT_VP8) {
		*max_width = DEFAULT_WIDTH;
		*max_height = DEFAULT_HEIGHT;
		}
		if (width > *max_width) {
		dprintk(VIDC_ERR,
		"Unsupported width = %u supported max width = %u\n",