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

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

Pull media fixes from Mauro Carvalho Chehab:

 - a rand Kconfig fixup for mtk-vcodec

 - a fix at h264 handling at cedrus codec driver

 - some warning fixes when config PM is not enabled at marvell-ccic

 - two fixes at venus codec driver: one related to codec profile and the
   other one related to a bad error path which causes an OOPS on module
   re-bind

* tag 'media/v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: venus: pm_helpers: Fix kernel module reload
  media: venus: venc: Fix setting of profile and level
  media: cedrus: h264: Fix check for presence of scaling matrix
  media: media/platform/marvell-ccic: fix warnings when CONFIG_PM is not enabled
  media: mtk-vcodec: fix build breakage when one of VPU or SCP is enabled
  media: mtk-vcodec: move firmware implementations into their own files
parents 127c501a 9215f6bb

drivers/media/platform/Kconfig

+21 −7
Original line number Diff line number Diff line
@@ -253,18 +253,32 @@ config VIDEO_MEDIATEK_VCODEC 
	depends on MTK_IOMMU || COMPILE_TEST

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on VIDEO_MEDIATEK_VPU || MTK_SCP

	# The two following lines ensure we have the same state ("m" or "y") as

	# our dependencies, to avoid missing symbols during link.

	depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU

	depends on MTK_SCP || !MTK_SCP

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	select VIDEO_MEDIATEK_VPU

	select MTK_SCP

	select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU

	select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP

	help

	  Mediatek video codec driver provides HW capability to

	    encode and decode in a range of video formats

	    This driver rely on VPU driver to communicate with VPU.

	  encode and decode in a range of video formats on MT8173

	  and MT8183.



	  Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to

	  also be selected. Support for MT8183 depends on MTK_SCP.



	  To compile this driver as modules, choose M here: the

	  modules will be called mtk-vcodec-dec and mtk-vcodec-enc.



config VIDEO_MEDIATEK_VCODEC_VPU

	bool



config VIDEO_MEDIATEK_VCODEC_SCP

	bool



config VIDEO_MEM2MEM_DEINTERLACE

	tristate "Deinterlace support"

	depends on VIDEO_DEV && VIDEO_V4L2

drivers/media/platform/marvell-ccic/mmp-driver.c

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static int mmpcam_platform_remove(struct platform_device *pdev) 
 * Suspend/resume support.

 */



#ifdef CONFIG_PM

static int mmpcam_runtime_resume(struct device *dev)

{

	struct mmp_camera *cam = dev_get_drvdata(dev);
@@ -352,6 +353,7 @@ static int __maybe_unused mmpcam_resume(struct device *dev) 
		return mccic_resume(&cam->mcam);

	return 0;

}

#endif



static const struct dev_pm_ops mmpcam_pm_ops = {

	SET_RUNTIME_PM_OPS(mmpcam_runtime_suspend, mmpcam_runtime_resume, NULL)

drivers/media/platform/mtk-vcodec/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -24,4 +24,12 @@ mtk-vcodec-enc-y := venc/venc_vp8_if.o \ 


mtk-vcodec-common-y := mtk_vcodec_intr.o \

		mtk_vcodec_util.o \

		mtk_vcodec_fw.o
 
		mtk_vcodec_fw.o \



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_VPU),)

mtk-vcodec-common-y += mtk_vcodec_fw_vpu.o

endif



ifneq ($(CONFIG_VIDEO_MEDIATEK_VCODEC_SCP),)

mtk-vcodec-common-y += mtk_vcodec_fw_scp.o

endif

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
	}

	dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));



	dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, VPU_RST_DEC);

	dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, DECODER);

	if (IS_ERR(dev->fw_handler))

		return PTR_ERR(dev->fw_handler);

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
	}

	dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));



	dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, VPU_RST_ENC);

	dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, ENCODER);

	if (IS_ERR(dev->fw_handler))

		return PTR_ERR(dev->fw_handler);

CRA Git | Maintained and supported by SUSTech CRA and CCSE