Commit f4e5e14f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 - Compilation fixes for GCC < 4.4.6
 - one Kbuild dependency select fix (selecting videobuf on msi3101)
 - driver fixes on tda10071, e4000, msi3101, soc_camera, s5p-jpeg,
   saa7134 and adv7511
 - some device quirks needed to make them work properly
 - some videobuf2 core regression fixes for some features used only on
   embedded drivers

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] saa7134: Fix crash when device is closed before streamoff
  [media] adv7511: fix error return code in adv7511_probe()
  [media] ths8200: fix compilation with GCC < 4.4.6
  [media] ad9389b: fix compilation with GCC < 4.4.6
  [media] adv7511: fix compilation with GCC < 4.4.6
  [media] adv7842: fix compilation with GCC < 4.4.6
  [media] s5p-jpeg: Initialize vfd_decoder->vfl_dir field
  [media] videobuf2-dc: Fix support for mappings without struct page in userptr mode
  [media] vb2: Allow queuing OUTPUT buffers with zeroed 'bytesused'
  [media] mx3-camera: locking cleanup in mx3_videobuf_queue()
  [media] sh_vou: almost forever loop in sh_vou_try_fmt_vid_out()
  [media] tda10071: change firmware download condition
  [media] msi3101: correct max videobuf2 alloc
  [media] Add HCL T12Rg-H to STK webcam upside-down table
  [media] msi3101: Kconfig select VIDEOBUF2_VMALLOC
  [media] msi3101: msi3101_ioctl_ops can be static
  [media] e4000: fix PLL calc bug on 32-bit arch
  [media] uvcvideo: quirk PROBE_DEF for Microsoft Lifecam NX-3000
  [media] uvcvideo: quirk PROBE_DEF for Dell SP2008WFP monitor
parents 0d645a8b 9c9cff55

drivers/media/dvb-frontends/tda10071.c

+1 −8
Original line number Diff line number Diff line
@@ -912,14 +912,8 @@ static int tda10071_init(struct dvb_frontend *fe) 
		{ 0xd5, 0x03, 0x03 },

	};



	/* firmware status */

	ret = tda10071_rd_reg(priv, 0x51, &tmp);

	if (ret)

		goto error;



	if (!tmp) {

	if (priv->warm) {

		/* warm state - wake up device from sleep */

		priv->warm = 1;



		for (i = 0; i < ARRAY_SIZE(tab); i++) {

			ret = tda10071_wr_reg_mask(priv, tab[i].reg,
@@ -937,7 +931,6 @@ static int tda10071_init(struct dvb_frontend *fe) 
			goto error;

	} else {

		/* cold state - try to download firmware */

		priv->warm = 0;



		/* request the firmware, this will block and timeout */

		ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);

drivers/media/i2c/ad9389b.c

+6 −9
Original line number Diff line number Diff line
@@ -628,16 +628,13 @@ static int ad9389b_s_stream(struct v4l2_subdev *sd, int enable) 


static const struct v4l2_dv_timings_cap ad9389b_timings_cap = {

	.type = V4L2_DV_BT_656_1120,

	.bt = {

		.max_width = 1920,

		.max_height = 1200,

		.min_pixelclock = 25000000,

		.max_pixelclock = 170000000,

		.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

	/* keep this initialization for compatibility with GCC < 4.4.6 */

	.reserved = { 0 },

	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,

		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,

		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |

			V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,

	},

		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

		V4L2_DV_BT_CAP_CUSTOM)

};



static int ad9389b_s_dv_timings(struct v4l2_subdev *sd,

drivers/media/i2c/adv7511.c

+9 −9
Original line number Diff line number Diff line
@@ -119,16 +119,14 @@ static int adv7511_s_clock_freq(struct v4l2_subdev *sd, u32 freq); 


static const struct v4l2_dv_timings_cap adv7511_timings_cap = {

	.type = V4L2_DV_BT_656_1120,

	.bt = {

		.max_width = ADV7511_MAX_WIDTH,

		.max_height = ADV7511_MAX_HEIGHT,

		.min_pixelclock = ADV7511_MIN_PIXELCLOCK,

		.max_pixelclock = ADV7511_MAX_PIXELCLOCK,

		.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

	/* keep this initialization for compatibility with GCC < 4.4.6 */

	.reserved = { 0 },

	V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT,

		ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK,

		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,

		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |

			V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,

	},

		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

			V4L2_DV_BT_CAP_CUSTOM)

};



static inline struct adv7511_state *get_adv7511_state(struct v4l2_subdev *sd)
@@ -1126,6 +1124,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * 
	state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1);

	if (state->i2c_edid == NULL) {

		v4l2_err(sd, "failed to register edid i2c client\n");

		err = -ENOMEM;

		goto err_entity;

	}
@@ -1133,6 +1132,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * 
	state->work_queue = create_singlethread_workqueue(sd->name);

	if (state->work_queue == NULL) {

		v4l2_err(sd, "could not create workqueue\n");

		err = -ENOMEM;

		goto err_unreg_cec;

	}

drivers/media/i2c/adv7842.c

+12 −18
Original line number Diff line number Diff line
@@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) 


static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {

	.type = V4L2_DV_BT_656_1120,

	.bt = {

		.max_width = 1920,

		.max_height = 1200,

		.min_pixelclock = 25000000,

		.max_pixelclock = 170000000,

		.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

	/* keep this initialization for compatibility with GCC < 4.4.6 */

	.reserved = { 0 },

	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,

		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,

		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |

			V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,

	},

		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

			V4L2_DV_BT_CAP_CUSTOM)

};



static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {

	.type = V4L2_DV_BT_656_1120,

	.bt = {

		.max_width = 1920,

		.max_height = 1200,

		.min_pixelclock = 25000000,

		.max_pixelclock = 225000000,

		.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

	/* keep this initialization for compatibility with GCC < 4.4.6 */

	.reserved = { 0 },

	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,

		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |

			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,

		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |

			V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,

	},

		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

			V4L2_DV_BT_CAP_CUSTOM)

};



static inline const struct v4l2_dv_timings_cap *

drivers/media/i2c/ths8200.c

+4 −8
Original line number Diff line number Diff line
@@ -46,14 +46,10 @@ struct ths8200_state { 


static const struct v4l2_dv_timings_cap ths8200_timings_cap = {

	.type = V4L2_DV_BT_656_1120,

	.bt = {

		.max_width = 1920,

		.max_height = 1080,

		.min_pixelclock = 25000000,

		.max_pixelclock = 148500000,

		.standards = V4L2_DV_BT_STD_CEA861,

		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE,

	},

	/* keep this initialization for compatibility with GCC < 4.4.6 */

	.reserved = { 0 },

	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000,

		V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE)

};



static inline struct ths8200_state *to_state(struct v4l2_subdev *sd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE