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

Merge tag 'media/v6.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - two Kconfig build fixes under randconfig

 - pxa_camera: Fix an error handling path

 - mediatek: vcodec: Fix a NULL-access pointer

 - tegra-video: fix an infinite recursion regression

* tag 'media/v6.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: mediatek: vcodec: Fix encoder access NULL pointer
  staging: media: tegra-video: fix infinite recursion regression
  media: pci: intel: ivsc: select V4L2_FWNODE
  media: ipu-bridge: Fix Kconfig dependencies
  media: pxa_camera: Fix an error handling path in pxa_camera_probe()
parents 5e5558f5 1146bec0

drivers/media/pci/intel/Kconfig

+14 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



source "drivers/media/pci/intel/ipu3/Kconfig"

source "drivers/media/pci/intel/ivsc/Kconfig"



config IPU_BRIDGE

	tristate

	tristate "Intel IPU Bridge"

	depends on I2C && ACPI

	help

	  This is a helper module for the IPU bridge, which can be

	  used by ipu3 and other drivers. In order to handle module

	  dependencies, this is selected by each driver that needs it.

	  The IPU bridge is a helper library for Intel IPU drivers to

	  function on systems shipped with Windows.



source "drivers/media/pci/intel/ipu3/Kconfig"

source "drivers/media/pci/intel/ivsc/Kconfig"
 
	  Currently used by the ipu3-cio2 and atomisp drivers.



	  Supported systems include:



	  - Microsoft Surface models (except Surface Pro 3)

	  - The Lenovo Miix line (for example the 510, 520, 710 and 720)

	  - Dell 7285

drivers/media/pci/intel/ipu3/Kconfig

+1 −20
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
config VIDEO_IPU3_CIO2

	tristate "Intel ipu3-cio2 driver"

	depends on VIDEO_DEV && PCI

	depends on IPU_BRIDGE || !IPU_BRIDGE

	depends on ACPI || COMPILE_TEST

	depends on X86

	select MEDIA_CONTROLLER

	select VIDEO_V4L2_SUBDEV_API

	select V4L2_FWNODE

	select VIDEOBUF2_DMA_SG

	select IPU_BRIDGE if CIO2_BRIDGE



	help

	  This is the Intel IPU3 CIO2 CSI-2 receiver unit, found in Intel
@@ -18,22 +18,3 @@ config VIDEO_IPU3_CIO2 
	  Say Y or M here if you have a Skylake/Kaby Lake SoC with MIPI CSI-2

	  connected camera.

	  The module will be called ipu3-cio2.
 


config CIO2_BRIDGE

	bool "IPU3 CIO2 Sensors Bridge"

	depends on VIDEO_IPU3_CIO2 && ACPI

	depends on I2C

	help

	  This extension provides an API for the ipu3-cio2 driver to create

	  connections to cameras that are hidden in the SSDB buffer in ACPI.

	  It can be used to enable support for cameras in detachable / hybrid

	  devices that ship with Windows.



	  Say Y here if your device is a detachable / hybrid laptop that comes

	  with Windows installed by the OEM, for example:



		- Microsoft Surface models (except Surface Pro 3)

		- The Lenovo Miix line (for example the 510, 520, 710 and 720)

		- Dell 7285



	  If in doubt, say N here.

drivers/media/pci/intel/ivsc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config INTEL_VSC 
	depends on INTEL_MEI && ACPI && VIDEO_DEV

	select MEDIA_CONTROLLER

	select VIDEO_V4L2_SUBDEV_API

	select V4L2_ASYNC

	select V4L2_FWNODE

	help

	  This adds support for Intel Visual Sensing Controller (IVSC).

drivers/media/platform/intel/pxa_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -2398,7 +2398,7 @@ static int pxa_camera_probe(struct platform_device *pdev) 
			       PXA_CAM_DRV_NAME, pcdev);

	if (err) {

		dev_err(&pdev->dev, "Camera interrupt register failed\n");

		goto exit_v4l2_device_unregister;

		goto exit_deactivate;

	}



	pcdev->notifier.ops = &pxa_camera_sensor_ops;

drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ int vpu_enc_init(struct venc_vpu_inst *vpu) 
	vpu->ctx->vpu_inst = vpu;



	status = mtk_vcodec_fw_ipi_register(vpu->ctx->dev->fw_handler, vpu->id,

					    vpu_enc_ipi_handler, "venc", NULL);

					    vpu_enc_ipi_handler, "venc",

					    vpu->ctx->dev);



	if (status) {

		mtk_venc_err(vpu->ctx, "vpu_ipi_register fail %d", status);