Commit 8268d067 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'br-v5.18l' of git://linuxtv.org/hverkuil/media_tree into media_stage 

Tag branch

* tag 'br-v5.18l' of git://linuxtv.org/hverkuil/media_tree

: (39 commits)
  media: imx-jpeg: Set V4L2_BUF_FLAG_LAST at eos
  media: meson-ir-tx: remove incorrect doc comment
  media: vivid: use time_is_after_jiffies() instead of open coding it
  media: wl128x: use time_is_before_jiffies() instead of open coding it
  media: tda8083: use time_is_after_jiffies() instead of open coding it
  media: stv0299: use time_is_before_jiffies() instead of open coding it
  media: si21xx: use time_is_before_jiffies() instead of open coding it
  media: cedrus: h264: Fix neighbour info buffer size
  media: cx88-mpeg: clear interrupt status register before streaming video
  media: cedrus: H265: Fix neighbour info buffer size
  media: fsl-viu: use GFP_KERNEL
  media: cx18: use GFP_KERNEL
  drivers: meson: vdec: add VP9 support to GXM
  stkwebcam: add new Asus laptop to upside_down table
  media: imx-jpeg: fix a bug of accessing array out of bounds
  media: sun6i-csi: fix colorspace in sun6i_video_try_fmt()
  media: usb: go7007: s2250-board: fix leak in probe()
  media: cedrus: Add watchdog for job completion
  pixfmt-yuv-planar.rst: fix typo: 'Cr, Cr' -> 'Cr, Cb'
  media: imx-jpeg: Remove unnecessary print function dev_err()
  ...

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parents 8bd4aaf4 d8ebe298

Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst

+5 −5
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ All components are stored with the same number of bits per component. 
      - 'NV21'

      - 8

      - 4:2:0

      - Cr, Cr

      - Cr, Cb

      - Yes

      - Linear

    * - V4L2_PIX_FMT_NV12M
@@ -90,7 +90,7 @@ All components are stored with the same number of bits per component. 
      - 'NM21'

      - 8

      - 4:2:0

      - Cr, Cr

      - Cr, Cb

      - No

      - Linear

    * - V4L2_PIX_FMT_NV12MT
@@ -120,7 +120,7 @@ All components are stored with the same number of bits per component. 
      - 'NV61'

      - 8

      - 4:2:2

      - Cr, Cr

      - Cr, Cb

      - Yes

      - Linear

    * - V4L2_PIX_FMT_NV16M
@@ -134,7 +134,7 @@ All components are stored with the same number of bits per component. 
      - 'NM61'

      - 8

      - 4:2:2

      - Cr, Cr

      - Cr, Cb

      - No

      - Linear

    * - V4L2_PIX_FMT_NV24
@@ -148,7 +148,7 @@ All components are stored with the same number of bits per component. 
      - 'NV42'

      - 8

      - 4:4:4

      - Cr, Cr

      - Cr, Cb

      - Yes

      - Linear

drivers/media/dvb-frontends/si21xx.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout) 
	dprintk("%s\n", __func__);



	while ((si21_readreg(state, LNB_CTRL_REG_1) & 0x8) == 8) {

		if (jiffies - start > timeout) {

		if (time_is_before_jiffies(start + timeout)) {

			dprintk("%s: timeout!!\n", __func__);

			return -ETIMEDOUT;

		}

drivers/media/dvb-frontends/stv0299.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout) 
	dprintk ("%s\n", __func__);



	while (stv0299_readreg(state, 0x0a) & 1) {

		if (jiffies - start > timeout) {

		if (time_is_before_jiffies(start + timeout)) {

			dprintk ("%s: timeout!!\n", __func__);

			return -ETIMEDOUT;

		}
@@ -201,7 +201,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout) 
	dprintk ("%s\n", __func__);



	while ((stv0299_readreg(state, 0x0a) & 3) != 2 ) {

		if (jiffies - start > timeout) {

		if (time_is_before_jiffies(start + timeout)) {

			dprintk ("%s: timeout!!\n", __func__);

			return -ETIMEDOUT;

		}

drivers/media/dvb-frontends/tda8083.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout) 
{

	unsigned long start = jiffies;



	while (jiffies - start < timeout &&

	while (time_is_after_jiffies(start + timeout) &&

	       !(tda8083_readreg(state, 0x02) & 0x80))

	{

		msleep(50);

drivers/media/i2c/saa7115.c

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ static void saa711x_set_lcr(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_forma 


static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *sliced)

{

	static u16 lcr2vbi[] = {

	static const u16 lcr2vbi[] = {

		0, V4L2_SLICED_TELETEXT_B, 0,	/* 1 */

		0, V4L2_SLICED_CAPTION_525,	/* 4 */

		V4L2_SLICED_WSS_625, 0,		/* 5 */