From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Feb 2026 20:20:25 +0000 (-0800)
Subject: Merge tag 'media/v7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ef56a07672e0d7ebe71c9d9b45f959f0c2f8e8;p=thirdparty%2Fkernel%2Flinux.git

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

Pull media updates from Mauro Carvalho Chehab:

 - Add support for GMSL1 and GMSL‑coax modules (PCI mgb4)

 - Add driver for TI VIP

 - AV1 – first kernel support (pixel‑format, decoder, transcoder)

 - Three new camera‑sensor drivers (os05b10, s5k3m5, s5kjn1)

 - Synopsys CSI‑2 receiver driver

 - Verisilicon & rkvdec – major fixes and enhancements

 - IPU6 (and 7) fixes and preparation for metadata

 - omap3isp: v4l2-compliance updates

 - Fix DVB streaming, drop wait_prepare/finish (dvb/vb2)

* tag 'media/v7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (307 commits)
  media: uvcvideo: Pass allocation size directly to uvc_alloc_urb_buffer
  media: uvcvideo: Fix allocation for small frame sizes
  media: uvcvideo: Return queued buffers on start_streaming() failure
  media: uvcvideo: Create an ID namespace for streaming output terminals
  media: rkvdec: Add HEVC support for the VDPU383 variant
  media: rkvdec: Add HEVC support for the VDPU381 variant
  media: rkvdec: Add H264 support for the VDPU383 variant
  media: rkvdec: Add H264 support for the VDPU381 variant
  media: rkvdec: Disable multicore support
  media: rkvdec: Enable all clocks without naming them
  media: rkvdec: Support per-variant interrupt handler
  media: rkvdec: Add RCB and SRAM support
  media: rkvdec: Add variant specific coded formats list
  media: rkvdec: Move hevc functions to common file
  media: rkvdec: Move h264 functions to common file
  media: rkvdec: Use structs to represent the HW RPS
  media: rkvdec: Move cabac tables to their own source file
  media: rkvdec: Switch to using structs instead of writel
  media: visl: Add HEVC short and long term RPS sets
  media: v4l2-ctrls: Add hevc_ext_sps_[ls]t_rps controls
  ...
---

b7ef56a07672e0d7ebe71c9d9b45f959f0c2f8e8
diff --cc drivers/media/i2c/ccs/ccs-core.c
index 0d7b922fd4c48,9c7f340ca9a11..aa4dd7e7cf5ad
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@@ -1974,11 -2082,23 +2082,25 @@@ static int ccs_post_streamoff(struct v4
  	struct ccs_sensor *sensor = to_ccs_sensor(subdev);
  	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
  
 -	return pm_runtime_put(&client->dev);
 +	pm_runtime_put(&client->dev);
 +
 +	return 0;
  }
  
+ static const struct ccs_csi_data_format
+ *ccs_validate_csi_data_format(struct ccs_sensor *sensor, u32 code)
+ {
+ 	unsigned int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(ccs_csi_data_formats); i++) {
+ 		if (sensor->mbus_frame_fmts & BIT_U64(i) &&
+ 		    ccs_csi_data_formats[i].code == code)
+ 			return &ccs_csi_data_formats[i];
+ 	}
+ 
+ 	return sensor->csi_format;
+ }
+ 
  static int ccs_enum_mbus_code(struct v4l2_subdev *subdev,
  			      struct v4l2_subdev_state *sd_state,
  			      struct v4l2_subdev_mbus_code_enum *code)
diff --cc drivers/media/mc/mc-request.c
index 3cca9a0c7c973,dbea4da5235b2..8ad10c72f9db6
--- a/drivers/media/mc/mc-request.c
+++ b/drivers/media/mc/mc-request.c
@@@ -315,12 -318,13 +318,13 @@@ int media_request_alloc(struct media_de
  
  	fd_prepare_file(fdf)->private_data = req;
  
 -	*alloc_fd = fd_publish(fdf);
 -
  	snprintf(req->debug_str, sizeof(req->debug_str), "%u:%d",
 -		 atomic_inc_return(&mdev->request_id), *alloc_fd);
 +		 atomic_inc_return(&mdev->request_id), fd_prepare_fd(fdf));
+ 	atomic_inc(&mdev->num_requests);
  	dev_dbg(mdev->dev, "request: allocated %s\n", req->debug_str);
  
 +	*alloc_fd = fd_publish(fdf);
 +
  	return 0;
  
  err_free_req: