kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c
..
..
@@ -3740,19 +3740,6 @@
3740
3740
 		ops->rawaf_enable(params_vdev, !!(module_ens & ISP2X_MODULE_RAWAF));
3741
3741
 }
3742
3742
 
3743
-static __maybe_unused
3744
-void __isp_config_hdrshd(struct rkisp_isp_params_vdev *params_vdev)
3745
-{
3746
-	struct rkisp_isp_params_v21_ops *ops =
3747
-		(struct rkisp_isp_params_v21_ops *)params_vdev->priv_ops;
3748
-	struct rkisp_isp_params_val_v21 *priv_val =
3749
-		(struct rkisp_isp_params_val_v21 *)params_vdev->priv_val;
3750
-
3751
-	ops->hdrmge_config(params_vdev, &priv_val->last_hdrmge, RKISP_PARAMS_SHD);
3752
-
3753
-	ops->hdrdrc_config(params_vdev, &priv_val->last_hdrdrc, RKISP_PARAMS_SHD);
3754
-}
3755
-
3756
3743
 static
3757
3744
 void rkisp_params_cfgsram_v21(struct rkisp_isp_params_vdev *params_vdev)
3758
3745
 {
..
..
@@ -3998,11 +3985,6 @@
3998
3985
 		rkisp_set_bits(params_vdev->dev, ISP_CTRL1,
3999
3986
 			       ISP2X_SYS_BIGMODE_MANUAL | ISP2X_SYS_BIGMODE_FORCEEN,
4000
3987
 			       ISP2X_SYS_BIGMODE_MANUAL | ISP2X_SYS_BIGMODE_FORCEEN, false);
4001
-
4002
-	priv_val->cur_hdrmge = params_vdev->isp21_params->others.hdrmge_cfg;
4003
-	priv_val->cur_hdrdrc = params_vdev->isp21_params->others.drc_cfg;
4004
-	priv_val->last_hdrmge = priv_val->cur_hdrmge;
4005
-	priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
4006
3988
 	spin_unlock(&params_vdev->config_lock);
4007
3989
 }
4008
3990
 
..
..
@@ -4210,8 +4192,6 @@
4210
4192
 {
4211
4193
 	struct isp21_isp_params_cfg *new_params = NULL;
4212
4194
 	struct rkisp_buffer *cur_buf = params_vdev->cur_buf;
4213
-	struct rkisp_device *dev = params_vdev->dev;
4214
-	struct rkisp_hw_dev *hw_dev = dev->hw_dev;
4215
4195
 
4216
4196
 	spin_lock(&params_vdev->config_lock);
4217
4197
 	if (!params_vdev->streamon)
..
..
@@ -4257,17 +4237,8 @@
4257
4237
 	__isp_isr_other_config(params_vdev, new_params, type);
4258
4238
 	__isp_isr_other_en(params_vdev, new_params, type);
4259
4239
 	__isp_isr_meas_en(params_vdev, new_params, type);
4260
-	if (!hw_dev->is_single && type != RKISP_PARAMS_SHD)
4261
-		__isp_config_hdrshd(params_vdev);
4262
4240
 
4263
4241
 	if (type != RKISP_PARAMS_IMD) {
4264
-		struct rkisp_isp_params_val_v21 *priv_val =
4265
-			(struct rkisp_isp_params_val_v21 *)params_vdev->priv_val;
4266
-
4267
-		priv_val->last_hdrmge = priv_val->cur_hdrmge;
4268
-		priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
4269
-		priv_val->cur_hdrmge = new_params->others.hdrmge_cfg;
4270
-		priv_val->cur_hdrdrc = new_params->others.drc_cfg;
4271
4242
 		new_params->module_cfg_update = 0;
4272
4243
 		vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
4273
4244
 		cur_buf = NULL;