Commit d0b1c313 authored by Arun Kumar K's avatar Arun Kumar K Committed by Mauro Carvalho Chehab

[media] exynos-gsc: Register v4l2 device

Gscaler video device registration was happening without reference to
a parent v4l2_dev causing probe to fail. The patch creates a parent
v4l2 device and uses it for the gsc m2m video device registration.
This fixes regression introduced with comit commit 1c1d86a1
[media] v4l2: always require v4l2_dev, rename parent to dev_parent
Signed-off-by: default avatarArun Kumar K <arun.kk@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Cc: stable@vger.kernel.org
parent 3396b096
...@@ -1122,10 +1122,14 @@ static int gsc_probe(struct platform_device *pdev) ...@@ -1122,10 +1122,14 @@ static int gsc_probe(struct platform_device *pdev)
goto err_clk; goto err_clk;
} }
ret = gsc_register_m2m_device(gsc); ret = v4l2_device_register(dev, &gsc->v4l2_dev);
if (ret) if (ret)
goto err_clk; goto err_clk;
ret = gsc_register_m2m_device(gsc);
if (ret)
goto err_v4l2;
platform_set_drvdata(pdev, gsc); platform_set_drvdata(pdev, gsc);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = pm_runtime_get_sync(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev);
...@@ -1147,6 +1151,8 @@ static int gsc_probe(struct platform_device *pdev) ...@@ -1147,6 +1151,8 @@ static int gsc_probe(struct platform_device *pdev)
pm_runtime_put(dev); pm_runtime_put(dev);
err_m2m: err_m2m:
gsc_unregister_m2m_device(gsc); gsc_unregister_m2m_device(gsc);
err_v4l2:
v4l2_device_unregister(&gsc->v4l2_dev);
err_clk: err_clk:
gsc_clk_put(gsc); gsc_clk_put(gsc);
return ret; return ret;
...@@ -1157,6 +1163,7 @@ static int gsc_remove(struct platform_device *pdev) ...@@ -1157,6 +1163,7 @@ static int gsc_remove(struct platform_device *pdev)
struct gsc_dev *gsc = platform_get_drvdata(pdev); struct gsc_dev *gsc = platform_get_drvdata(pdev);
gsc_unregister_m2m_device(gsc); gsc_unregister_m2m_device(gsc);
v4l2_device_unregister(&gsc->v4l2_dev);
vb2_dma_contig_cleanup_ctx(gsc->alloc_ctx); vb2_dma_contig_cleanup_ctx(gsc->alloc_ctx);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
......
...@@ -343,6 +343,7 @@ struct gsc_dev { ...@@ -343,6 +343,7 @@ struct gsc_dev {
unsigned long state; unsigned long state;
struct vb2_alloc_ctx *alloc_ctx; struct vb2_alloc_ctx *alloc_ctx;
struct video_device vdev; struct video_device vdev;
struct v4l2_device v4l2_dev;
}; };
/** /**
......
...@@ -751,6 +751,7 @@ int gsc_register_m2m_device(struct gsc_dev *gsc) ...@@ -751,6 +751,7 @@ int gsc_register_m2m_device(struct gsc_dev *gsc)
gsc->vdev.release = video_device_release_empty; gsc->vdev.release = video_device_release_empty;
gsc->vdev.lock = &gsc->lock; gsc->vdev.lock = &gsc->lock;
gsc->vdev.vfl_dir = VFL_DIR_M2M; gsc->vdev.vfl_dir = VFL_DIR_M2M;
gsc->vdev.v4l2_dev = &gsc->v4l2_dev;
snprintf(gsc->vdev.name, sizeof(gsc->vdev.name), "%s.%d:m2m", snprintf(gsc->vdev.name, sizeof(gsc->vdev.name), "%s.%d:m2m",
GSC_MODULE_NAME, gsc->id); GSC_MODULE_NAME, gsc->id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment