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

Merge tag 'media/v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - a V4L2 core regression at videobuf2 when checking for single-plane
   dmabuf

 - a change at uAPI header v4l2-subdev.h, fixing a breakage as BIT()
   macro is not available in userspace

 - fix some regressions at RC core due to the usage of microseconds
   everywhere on it

 - a fix for a race condition at RC core

 - a rename on a newly-introduced kAPI symbol (v4l2_get_link_rate),
   currently used only by a single driver

 - Regression fixes for rcar-vin, cedrus, ite-cir, hantro, css, venus,
   and cec drivers.

* tag 'media/v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: hantro: Fix reset_raw_fmt initialization
  media: cec: add stm32 driver
  media: cedrus: Fix H264 decoding
  media: v4l2-subdev.h: BIT() is not available in userspace
  media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
  media: rc: ite-cir: fix min_timeout calculation
  media: venus: core: Fix platform driver shutdown
  media: rc: fix timeout handling after switch to microsecond durations
  media: v4l: common: Fix naming of v4l2_get_link_rate
  media: rcar-vin: fix return, use ret instead of zero
  media: ccs: Get static data version minor correctly
  media: ccs-pll: Fix link frequency for C-PHY
  media: rc: ensure that uevent can be read directly after rc device register
parents a467b073 e081863a

drivers/media/cec/platform/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ obj-$(CONFIG_CEC_MESON_AO) += meson/ 
obj-$(CONFIG_CEC_SAMSUNG_S5P)	+= s5p/

obj-$(CONFIG_CEC_SECO)		+= seco/

obj-$(CONFIG_CEC_STI)		+= sti/

obj-$(CONFIG_CEC_STM32)		+= stm32/

obj-$(CONFIG_CEC_TEGRA)		+= tegra/

drivers/media/common/videobuf2/videobuf2-v4l2.c

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b) 
				return -EINVAL;

		}

	} else {

		length = (b->memory == VB2_MEMORY_USERPTR ||

			  b->memory == VB2_MEMORY_DMABUF)

		length = (b->memory == VB2_MEMORY_USERPTR)

			? b->length : vb->planes[0].length;



		if (b->bytesused > length)

drivers/media/i2c/ccs-pll.c

+1 −7
Original line number Diff line number Diff line
@@ -772,14 +772,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, 


	switch (pll->bus_type) {

	case CCS_PLL_BUS_TYPE_CSI2_DPHY:

		/* CSI transfers 2 bits per clock per lane; thus times 2 */

		op_sys_clk_freq_hz_sdr = pll->link_freq * 2

			* (pll->flags & CCS_PLL_FLAG_LANE_SPEED_MODEL ?

			   1 : pll->csi2.lanes);

		break;

	case CCS_PLL_BUS_TYPE_CSI2_CPHY:

		op_sys_clk_freq_hz_sdr =

			pll->link_freq

		op_sys_clk_freq_hz_sdr = pll->link_freq * 2

			* (pll->flags & CCS_PLL_FLAG_LANE_SPEED_MODEL ?

			   1 : pll->csi2.lanes);

		break;

drivers/media/i2c/ccs/ccs-data.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int ccs_data_parse_version(struct bin_container *bin, 
	vv->version_major = ((u16)v->static_data_version_major[0] << 8) +

		v->static_data_version_major[1];

	vv->version_minor = ((u16)v->static_data_version_minor[0] << 8) +

		v->static_data_version_major[1];

		v->static_data_version_minor[1];

	vv->date_year =  ((u16)v->year[0] << 8) + v->year[1];

	vv->date_month = v->month;

	vv->date_day = v->day;

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int cio2_csi2_calc_timing(struct cio2_device *cio2, struct cio2_queue *q, 
	if (!q->sensor)

		return -ENODEV;



	freq = v4l2_get_link_rate(q->sensor->ctrl_handler, bpp, lanes);

	freq = v4l2_get_link_freq(q->sensor->ctrl_handler, bpp, lanes);

	if (freq < 0) {

		dev_err(dev, "error %lld, invalid link_freq\n", freq);

		return freq;