From 1543e317f1da31b75942316931e8f491a8920811 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Thu, 04 Jan 2024 10:08:02 +0000
Subject: [PATCH] disable FB
---
kernel/drivers/media/platform/rockchip/isp/isp_mipi_luma.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/kernel/drivers/media/platform/rockchip/isp/isp_mipi_luma.c
index 797de4e..1e2039e 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_mipi_luma.c
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_mipi_luma.c
@@ -82,9 +82,12 @@
struct rkisp_luma_vdev *params = video_drvdata(filp);
int ret;
+ if (!params->dev->is_probe_end)
+ return -EINVAL;
+
ret = v4l2_fh_open(filp);
if (!ret) {
- ret = v4l2_pipeline_pm_use(¶ms->vnode.vdev.entity, 1);
+ ret = v4l2_pipeline_pm_get(¶ms->vnode.vdev.entity);
if (ret < 0)
vb2_fop_release(filp);
}
@@ -98,12 +101,8 @@
int ret;
ret = vb2_fop_release(file);
- if (!ret) {
- ret = v4l2_pipeline_pm_use(&luma->vnode.vdev.entity, 0);
- if (ret < 0)
- v4l2_err(&luma->dev->v4l2_dev,
- "set pipeline power failed %d\n", ret);
- }
+ if (!ret)
+ v4l2_pipeline_pm_put(&luma->vnode.vdev.entity);
return ret;
}
@@ -397,7 +396,7 @@
if (send_task) {
luma_vdev->work.readout = RKISP_ISP_READOUT_LUMA;
- luma_vdev->work.timestamp = ktime_get_ns();
+ luma_vdev->work.timestamp = rkisp_time_get_ns(luma_vdev->dev);
luma_vdev->work.frame_id = cur_frame_id;
if (frm_mode == RKISP_LUMA_THREEFRM)
@@ -473,7 +472,7 @@
if (ret < 0)
goto err_release_queue;
- ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+ ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
if (ret < 0) {
dev_err(&vdev->dev,
"could not register Video for Linux device\n");
--
Gitblit v1.6.2