media: tegra-video: Enable TPG based on kernel config

Tegra internal TPG mode is only for Tegra vi and csi testing
without a real sensor and driver should default support real
sensor.

So, This patch adds CONFIG_VIDEO_TEGRA_TPG and enables Tegra
internal TPG mode only when this config is selected.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/tegra-video/Kconfig b/drivers/staging/media/tegra-video/Kconfig
index f6c61ec..566da62 100644 (file)
--- a/drivers/staging/media/tegra-video/Kconfig
+++ b/drivers/staging/media/tegra-video/Kconfig
@@ -10,3 +10,9 @@ config VIDEO_TEGRA
 
          To compile this driver as a module, choose M here: the module
          will be called tegra-video.
+
+config VIDEO_TEGRA_TPG
+       bool "NVIDIA Tegra VI driver TPG mode"
+       depends on VIDEO_TEGRA
+       help
+         Say yes here to enable Tegra internal TPG mode

diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index 40ea195..fb667df 100644 (file)
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -62,6 +62,9 @@ static int csi_enum_bus_code(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_pad_config *cfg,
                             struct v4l2_subdev_mbus_code_enum *code)
 {
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        if (code->index >= ARRAY_SIZE(tegra_csi_tpg_fmts))
                return -EINVAL;
 
@@ -76,6 +79,9 @@ static int csi_get_format(struct v4l2_subdev *subdev,
 {
        struct tegra_csi_channel *csi_chan = to_csi_chan(subdev);
 
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        fmt->format = csi_chan->format;
 
        return 0;
@@ -121,6 +127,9 @@ static int csi_enum_framesizes(struct v4l2_subdev *subdev,
 {
        unsigned int i;
 
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        if (fse->index >= ARRAY_SIZE(tegra_csi_tpg_sizes))
                return -EINVAL;
 
@@ -148,6 +157,9 @@ static int csi_enum_frameintervals(struct v4l2_subdev *subdev,
        const struct tpg_framerate *frmrate = csi->soc->tpg_frmrate_table;
        int index;
 
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        /* one framerate per format and resolution */
        if (fie->index > 0)
                return -EINVAL;
@@ -172,6 +184,9 @@ static int csi_set_format(struct v4l2_subdev *subdev,
        const struct v4l2_frmsize_discrete *sizes;
        unsigned int i;
 
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        sizes = v4l2_find_nearest_size(tegra_csi_tpg_sizes,
                                       ARRAY_SIZE(tegra_csi_tpg_sizes),
                                       width, height,
@@ -208,6 +223,9 @@ static int tegra_csi_g_frame_interval(struct v4l2_subdev *subdev,
 {
        struct tegra_csi_channel *csi_chan = to_csi_chan(subdev);
 
+       if (!IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               return -ENOIOCTLCMD;
+
        vfi->interval.numerator = 1;
        vfi->interval.denominator = csi_chan->framerate;
 
@@ -311,8 +329,12 @@ static int tegra_csi_channel_init(struct tegra_csi_channel *chan)
        subdev = &chan->subdev;
        v4l2_subdev_init(subdev, &tegra_csi_ops);
        subdev->dev = csi->dev;
-       snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s-%d", "tpg",
-                chan->csi_port_num);
+       if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s-%d", "tpg",
+                        chan->csi_port_num);
+       else
+               snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s",
+                        kbasename(chan->of_node->full_name));
 
        v4l2_set_subdevdata(subdev, chan);
        subdev->fwnode = of_fwnode_handle(chan->of_node);
@@ -405,11 +427,13 @@ static int tegra_csi_init(struct host1x_client *client)
 
        INIT_LIST_HEAD(&csi->csi_chans);
 
-       ret = tegra_csi_tpg_channels_alloc(csi);
-       if (ret < 0) {
-               dev_err(csi->dev,
-                       "failed to allocate tpg channels: %d\n", ret);
-               goto cleanup;
+       if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) {
+               ret = tegra_csi_tpg_channels_alloc(csi);
+               if (ret < 0) {
+                       dev_err(csi->dev,
+                               "failed to allocate tpg channels: %d\n", ret);
+                       goto cleanup;
+               }
        }
 
        ret = tegra_csi_channels_init(csi);

diff --git a/drivers/staging/media/tegra-video/tegra210.c b/drivers/staging/media/tegra-video/tegra210.c
index 3baa4e3..3492a8a 100644 (file)
--- a/drivers/staging/media/tegra-video/tegra210.c
+++ b/drivers/staging/media/tegra-video/tegra210.c
@@ -631,7 +631,11 @@ const struct tegra_vi_soc tegra210_vi_soc = {
        .ops = &tegra210_vi_ops,
        .hw_revision = 3,
        .vi_max_channels = 6,
+#if IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)
        .vi_max_clk_hz = 499200000,
+#else
+       .vi_max_clk_hz = 998400000,
+#endif
 };
 
 /* Tegra210 CSI PHY registers accessors */
@@ -957,7 +961,9 @@ static const char * const tegra210_csi_cil_clks[] = {
        "cilab",
        "cilcd",
        "cile",
+#if IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)
        "csi_tpg",
+#endif
 };
 
 /* Tegra210 CSI operations */

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index 0ae1771..4ad3da5 100644 (file)
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -565,6 +565,7 @@ static int tegra_channel_setup_ctrl_handler(struct tegra_vi_channel *chan)
 {
        int ret;
 
+#if IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)
        /* add test pattern control handler to v4l2 device */
        v4l2_ctrl_new_std_menu_items(&chan->ctrl_handler, &vi_ctrl_ops,
                                     V4L2_CID_TEST_PATTERN,
@@ -576,6 +577,7 @@ static int tegra_channel_setup_ctrl_handler(struct tegra_vi_channel *chan)
                v4l2_ctrl_handler_free(&chan->ctrl_handler);
                return chan->ctrl_handler.error;
        }
+#endif
 
        /* setup the controls */
        ret = v4l2_ctrl_handler_setup(&chan->ctrl_handler);
@@ -914,10 +916,13 @@ static int tegra_vi_init(struct host1x_client *client)
 
        INIT_LIST_HEAD(&vi->vi_chans);
 
-       ret = tegra_vi_tpg_channels_alloc(vi);
-       if (ret < 0) {
-               dev_err(vi->dev, "failed to allocate tpg channels: %d\n", ret);
-               goto free_chans;
+       if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) {
+               ret = tegra_vi_tpg_channels_alloc(vi);
+               if (ret < 0) {
+                       dev_err(vi->dev,
+                               "failed to allocate tpg channels: %d\n", ret);
+                       goto free_chans;
+               }
        }
 
        ret = tegra_vi_channels_init(vi);

diff --git a/drivers/staging/media/tegra-video/video.c b/drivers/staging/media/tegra-video/video.c
index 30816aa..e50bd70 100644 (file)
--- a/drivers/staging/media/tegra-video/video.c
+++ b/drivers/staging/media/tegra-video/video.c
@@ -60,15 +60,17 @@ static int host1x_video_probe(struct host1x_device *dev)
        if (ret < 0)
                goto unregister_v4l2;
 
-       /*
-        * Both vi and csi channels are available now.
-        * Register v4l2 nodes and create media links for TPG.
-        */
-       ret = tegra_v4l2_nodes_setup_tpg(vid);
-       if (ret < 0) {
-               dev_err(&dev->dev,
-                       "failed to setup tpg graph: %d\n", ret);
-               goto device_exit;
+       if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) {
+               /*
+                * Both vi and csi channels are available now.
+                * Register v4l2 nodes and create media links for TPG.
+                */
+               ret = tegra_v4l2_nodes_setup_tpg(vid);
+               if (ret < 0) {
+                       dev_err(&dev->dev,
+                               "failed to setup tpg graph: %d\n", ret);
+                       goto device_exit;
+               }
        }
 
        return 0;
@@ -91,7 +93,8 @@ static int host1x_video_remove(struct host1x_device *dev)
 {
        struct tegra_video_device *vid = dev_get_drvdata(&dev->dev);
 
-       tegra_v4l2_nodes_cleanup_tpg(vid);
+       if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
+               tegra_v4l2_nodes_cleanup_tpg(vid);
 
        host1x_device_exit(dev);