export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/drivers/media/platform/rockchip/cif/cif-luma.c
..
..
@@ -91,7 +91,7 @@
91
91
 
92
92
 	ret = v4l2_fh_open(filp);
93
93
 	if (!ret) {
94
-		ret = v4l2_pipeline_pm_use(&params->vnode.vdev.entity, 1);
94
+		ret = v4l2_pipeline_pm_get(&params->vnode.vdev.entity);
95
95
 		if (ret < 0)
96
96
 			vb2_fop_release(filp);
97
97
 	}
..
..
@@ -105,12 +105,8 @@
105
105
 	int ret;
106
106
 
107
107
 	ret = vb2_fop_release(file);
108
-	if (!ret) {
109
-		ret = v4l2_pipeline_pm_use(&luma->vnode.vdev.entity, 0);
110
-		if (ret < 0)
111
-			v4l2_err(&luma->cifdev->v4l2_dev,
112
-				 "set pipeline power failed %d\n", ret);
113
-	}
108
+	if (!ret)
109
+		v4l2_pipeline_pm_put(&luma->vnode.vdev.entity);
114
110
 	return ret;
115
111
 }
116
112
 
..
..
@@ -293,7 +289,7 @@
293
289
 
294
290
 void rkcif_luma_isr(struct rkcif_luma_vdev *luma_vdev, int mipi_id, u32 frame_id)
295
291
 {
296
-	u8 hdr_mode = luma_vdev->cifdev->hdr.mode;
292
+	u8 hdr_mode = luma_vdev->cifdev->hdr.hdr_mode;
297
293
 	enum rkcif_luma_frm_mode frm_mode;
298
294
 	bool send_task;
299
295
 	u32 i, value;
..
..
@@ -365,7 +361,7 @@
365
361
 
366
362
 	if (send_task) {
367
363
 		luma_vdev->work.readout = RKCIF_READOUT_LUMA;
368
-		luma_vdev->work.timestamp = ktime_get_ns();
364
+		luma_vdev->work.timestamp = rkcif_time_get_ns(luma_vdev->cifdev);
369
365
 		luma_vdev->work.frame_id = frame_id;
370
366
 
371
367
 		if (frm_mode == RKCIF_LUMA_THREEFRM)
..
..
@@ -478,7 +474,7 @@
478
474
 	if (ret < 0)
479
475
 		goto err_release_queue;
480
476
 
481
-	ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
477
+	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
482
478
 	if (ret < 0) {
483
479
 		dev_err(&vdev->dev,
484
480
 			"could not register Video for Linux device\n");