Commit 4f03d537 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Hans Verkuil
Browse files

media: platform: mtk-vcodec: Do not force /dev/videoX node number 



Let's v4l2 framework use a free /dev/videoX node for decode and encoder.
For the decoder call video_register_device() before register the media
controller device so the mapping between ins correctly done.
Since the registering sequence has changed rework exiting errors case too.

Fixes: 590577a4 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
Fixes: 4e855a6e ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver")

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 9a5e6900

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

+12 −15
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
	if (IS_ERR((__force void *)dev->m2m_dev_dec)) {

		mtk_v4l2_err("Failed to init mem2mem dec device");

		ret = PTR_ERR((__force void *)dev->m2m_dev_dec);

		goto err_dec_mem_init;

		goto err_dec_alloc;

	}



	dev->decode_workqueue =
@@ -391,10 +391,16 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
					   &pdev->dev);

		if (ret) {

			mtk_v4l2_err("Main device of_platform_populate failed.");

			goto err_event_workq;

			goto err_reg_cont;

		}

	}



	ret = video_register_device(vfd_dec, VFL_TYPE_VIDEO, -1);

	if (ret) {

		mtk_v4l2_err("Failed to register video device");

		goto err_reg_cont;

	}



	if (dev->vdec_pdata->uses_stateless_api) {

		dev->mdev_dec.dev = &pdev->dev;

		strscpy(dev->mdev_dec.model, MTK_VCODEC_DEC_NAME,
@@ -408,7 +414,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
							 MEDIA_ENT_F_PROC_VIDEO_DECODER);

		if (ret) {

			mtk_v4l2_err("Failed to register media controller");

			goto err_reg_cont;

			goto err_dec_mem_init;

		}



		ret = media_device_register(&dev->mdev_dec);
@@ -419,30 +425,21 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 


		mtk_v4l2_debug(0, "media registered as /dev/media%d", vfd_dec->minor);

	}

	ret = video_register_device(vfd_dec, VFL_TYPE_VIDEO, 0);

	if (ret) {

		mtk_v4l2_err("Failed to register video device");

		goto err_dec_reg;

	}



	mtk_v4l2_debug(0, "decoder registered as /dev/video%d", vfd_dec->minor);



	return 0;



err_dec_reg:

	if (dev->vdec_pdata->uses_stateless_api)

		media_device_unregister(&dev->mdev_dec);

err_media_reg:

	if (dev->vdec_pdata->uses_stateless_api)

	v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec);

err_dec_mem_init:

	video_unregister_device(vfd_dec);

err_reg_cont:

	if (dev->vdec_pdata->uses_stateless_api)

		media_device_cleanup(&dev->mdev_dec);

	destroy_workqueue(dev->decode_workqueue);

err_event_workq:

	v4l2_m2m_release(dev->m2m_dev_dec);

err_dec_mem_init:

	video_unregister_device(vfd_dec);

err_dec_alloc:

	v4l2_device_unregister(&dev->v4l2_dev);

err_core_workq:

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

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
	if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL))

		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));



	ret = video_register_device(vfd_enc, VFL_TYPE_VIDEO, 1);

	ret = video_register_device(vfd_enc, VFL_TYPE_VIDEO, -1);

	if (ret) {

		mtk_v4l2_err("Failed to register video device");

		goto err_enc_reg;