add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/media/platform/rockchip/isp/isp_stats_v2x.c
..
..
@@ -55,17 +55,13 @@
55
55
 		ISP2X_SIAWB_GET_MEAN_Y_G(reg_val);
56
56
 }
57
57
 
58
-static int
58
+static void
59
59
 rkisp_stats_get_rawawb_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
60
60
 				struct rkisp_isp2x_stat_buffer *pbuf)
61
61
 {
62
62
 	u64 msb, lsb;
63
-	u32 ctrl;
63
+	u32 value;
64
64
 	int i;
65
-
66
-	ctrl = rkisp_read(stats_vdev->dev, ISP_RAWAWB_CTRL, true);
67
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
68
-		return -ENODATA;
69
65
 
70
66
 	if (!pbuf)
71
67
 		goto out;
..
..
@@ -159,8 +155,9 @@
159
155
 	}
160
156
 
161
157
 out:
162
-	rkisp_write(stats_vdev->dev, ISP_RAWAWB_CTRL, ctrl, true);
163
-	return 0;
158
+	value = rkisp_read(stats_vdev->dev, ISP_RAWAWB_CTRL, true);
159
+	value |= ISP2X_3A_MEAS_DONE;
160
+	rkisp_write(stats_vdev->dev, ISP_RAWAWB_CTRL, value, true);
164
161
 }
165
162
 
166
163
 static void
..
..
@@ -183,18 +180,14 @@
183
180
 	af->win[2].lum = rkisp_read(stats_vdev->dev, ISP_AFM_LUM_C, true);
184
181
 }
185
182
 
186
-static int
183
+static void
187
184
 rkisp_stats_get_rawaf_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
188
185
 			       struct rkisp_isp2x_stat_buffer *pbuf)
189
186
 {
190
187
 	struct isp2x_rawaf_stat *af;
191
-	u32 value, read_line, ctrl;
188
+	u32 value, read_line;
192
189
 	u32 line_num[ISP2X_RAWAF_LINE_NUM + 1];
193
190
 	int i;
194
-
195
-	ctrl = rkisp_read(stats_vdev->dev, ISP_RAWAF_CTRL, true);
196
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
197
-		return -ENODATA;
198
191
 
199
192
 	if (!pbuf)
200
193
 		goto out;
..
..
@@ -231,21 +224,18 @@
231
224
 		af->ramdata[i] = rkisp_read(stats_vdev->dev, ISP_RAWAF_RAM_DATA, true);
232
225
 
233
226
 out:
234
-	rkisp_write(stats_vdev->dev, ISP_RAWAF_CTRL, ctrl, true);
227
+	value = rkisp_read(stats_vdev->dev, ISP_RAWAF_CTRL, true);
228
+	value |= ISP2X_3A_MEAS_DONE;
229
+	rkisp_write(stats_vdev->dev, ISP_RAWAF_CTRL, value, true);
235
230
 	rkisp_write(stats_vdev->dev, ISP_RAWAF_INT_STATE, 0, true);
236
-	return 0;
237
231
 }
238
232
 
239
-static int
233
+static void
240
234
 rkisp_stats_get_yuvae_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
241
235
 			       struct rkisp_isp2x_stat_buffer *pbuf)
242
236
 {
243
-	u32 value, ctrl;
237
+	u32 value;
244
238
 	int i;
245
-
246
-	ctrl = rkisp_read(stats_vdev->dev, ISP_YUVAE_CTRL, true);
247
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
248
-		return -ENODATA;
249
239
 
250
240
 	if (!pbuf)
251
241
 		goto out;
..
..
@@ -266,8 +256,9 @@
266
256
 			rkisp_read(stats_vdev->dev, ISP_YUVAE_WND1_SUMY + 4 * i, true);
267
257
 
268
258
 out:
269
-	rkisp_write(stats_vdev->dev, ISP_YUVAE_CTRL, ctrl, true);
270
-	return 0;
259
+	value = rkisp_read(stats_vdev->dev, ISP_YUVAE_CTRL, true);
260
+	value |= ISP2X_3A_MEAS_DONE;
261
+	rkisp_write(stats_vdev->dev, ISP_YUVAE_CTRL, value, true);
271
262
 }
272
263
 
273
264
 static void
..
..
@@ -293,11 +284,11 @@
293
284
 	}
294
285
 }
295
286
 
296
-static int
287
+static void
297
288
 rkisp_stats_get_rawaebig_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
298
289
 				  struct isp2x_rawaebig_stat *ae, u32 blk_no)
299
290
 {
300
-	u32 addr, value, ctrl;
291
+	u32 addr, value;
301
292
 	int i;
302
293
 
303
294
 	switch (blk_no) {
..
..
@@ -314,10 +305,6 @@
314
305
 		addr = RAWAE_BIG1_BASE;
315
306
 		break;
316
307
 	}
317
-
318
-	ctrl = rkisp_read(stats_vdev->dev, addr + RAWAE_BIG_CTRL, true);
319
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
320
-		return -ENODATA;
321
308
 
322
309
 	if (!ae)
323
310
 		goto out;
..
..
@@ -339,15 +326,16 @@
339
326
 	}
340
327
 
341
328
 out:
342
-	rkisp_write(stats_vdev->dev, addr + RAWAE_BIG_CTRL, ctrl, true);
343
-	return 0;
329
+	value = rkisp_read(stats_vdev->dev, addr + RAWAE_BIG_CTRL, true);
330
+	value |= ISP2X_3A_MEAS_DONE;
331
+	rkisp_write(stats_vdev->dev, addr + RAWAE_BIG_CTRL, value, true);
344
332
 }
345
333
 
346
-static int
334
+static void
347
335
 rkisp_stats_get_rawhstbig_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
348
336
 				   struct isp2x_rawhistbig_stat *hst, u32 blk_no)
349
337
 {
350
-	u32 addr, ctrl;
338
+	u32 addr, value;
351
339
 	int i;
352
340
 
353
341
 	switch (blk_no) {
..
..
@@ -365,10 +353,6 @@
365
353
 		break;
366
354
 	}
367
355
 
368
-	ctrl = rkisp_read(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, true);
369
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
370
-		return -ENODATA;
371
-
372
356
 	if (!hst)
373
357
 		goto out;
374
358
 
..
..
@@ -377,129 +361,87 @@
377
361
 					      addr + ISP_RAWHIST_BIG_RO_BASE_BIN, true);
378
362
 
379
363
 out:
380
-	rkisp_write(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, ctrl, true);
381
-	return 0;
364
+	value = rkisp_read(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, true);
365
+	value |= ISP2X_3A_MEAS_DONE;
366
+	rkisp_write(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, value, true);
382
367
 }
383
368
 
384
-static int
369
+static void
385
370
 rkisp_stats_get_rawae1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
386
371
 				struct rkisp_isp2x_stat_buffer *pbuf)
387
372
 {
388
-	int ret = 0;
389
-
390
-	if (!pbuf) {
373
+	if (!pbuf)
391
374
 		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 1);
392
-	} else {
393
-		ret = rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae1, 1);
394
-		if (!ret)
395
-			pbuf->meas_type |= ISP2X_STAT_RAWAE1;
396
-	}
397
-
398
-	return ret;
375
+	else
376
+		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae1, 1);
399
377
 }
400
378
 
401
-static int
379
+static void
402
380
 rkisp_stats_get_rawhst1_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
403
381
 				 struct rkisp_isp2x_stat_buffer *pbuf)
404
382
 {
405
-	int ret = 0;
406
-
407
-	if (!pbuf) {
383
+	if (!pbuf)
408
384
 		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 1);
409
-	} else {
410
-		ret = rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist1, 1);
411
-		if (!ret)
412
-			pbuf->meas_type |= ISP2X_STAT_RAWHST1;
413
-	}
414
-
415
-	return ret;
385
+	else
386
+		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist1, 1);
416
387
 }
417
388
 
418
-static int
389
+static void
419
390
 rkisp_stats_get_rawae2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
420
391
 				struct rkisp_isp2x_stat_buffer *pbuf)
421
392
 {
422
-	int ret = 0;
423
-
424
-	if (!pbuf) {
393
+	if (!pbuf)
425
394
 		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 2);
426
-	} else {
395
+	else
427
396
 		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae2, 2);
428
-		if (!ret)
429
-			pbuf->meas_type |= ISP2X_STAT_RAWAE2;
430
-	}
431
-
432
-	return ret;
433
397
 }
434
398
 
435
-static int
399
+static void
436
400
 rkisp_stats_get_rawhst2_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
437
401
 				 struct rkisp_isp2x_stat_buffer *pbuf)
438
402
 {
439
-	int ret = 0;
440
-
441
-	if (!pbuf) {
403
+	if (!pbuf)
442
404
 		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 2);
443
-	} else {
444
-		ret = rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist2, 2);
445
-		if (!ret)
446
-			pbuf->meas_type |= ISP2X_STAT_RAWHST2;
447
-	}
448
-
449
-	return ret;
405
+	else
406
+		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist2, 2);
450
407
 }
451
408
 
452
-static int
409
+static void
453
410
 rkisp_stats_get_rawae3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
454
411
 				struct rkisp_isp2x_stat_buffer *pbuf)
455
412
 {
456
-	int ret = 0;
457
-
458
-	if (!pbuf) {
413
+	if (!pbuf)
459
414
 		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, NULL, 0);
460
-	} else {
461
-		ret = rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae3, 0);
462
-		if (!ret)
463
-			pbuf->meas_type |= ISP2X_STAT_RAWAE3;
464
-	}
465
-
466
-	return ret;
415
+	else
416
+		rkisp_stats_get_rawaebig_meas_reg(stats_vdev, &pbuf->params.rawae3, 0);
467
417
 }
468
418
 
469
-static int
419
+static void
470
420
 rkisp_stats_get_rawhst3_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
471
421
 				 struct rkisp_isp2x_stat_buffer *pbuf)
472
422
 {
473
-	int ret = 0;
474
-
475
-	if (!pbuf) {
423
+	if (!pbuf)
476
424
 		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, NULL, 0);
477
-	} else {
478
-		ret = rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist3, 0);
479
-		if (!ret)
480
-			pbuf->meas_type |= ISP2X_STAT_RAWHST3;
481
-	}
482
-
483
-	return ret;
425
+	else
426
+		rkisp_stats_get_rawhstbig_meas_reg(stats_vdev, &pbuf->params.rawhist3, 0);
484
427
 }
485
428
 
486
-static int
429
+static void
487
430
 rkisp_stats_get_rawaelite_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
488
431
 				   struct rkisp_isp2x_stat_buffer *pbuf)
489
432
 {
490
433
 	struct isp2x_rawaelite_stat *ae;
491
-	u32 value, ctrl;
434
+	u32 value;
492
435
 	int i;
493
-
494
-	ctrl = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
495
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
496
-		return -ENODATA;
497
436
 
498
437
 	if (!pbuf)
499
438
 		goto out;
500
439
 
501
-	pbuf->meas_type |= ISP2X_STAT_RAWAE0;
502
440
 	ae = &pbuf->params.rawae0;
441
+	value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
442
+
443
+	if ((value & ISP2X_3A_MEAS_DONE) == 0)
444
+		return;
503
445
 
504
446
 	for (i = 0; i < ISP2X_RAWAELITE_MEAN_NUM; i++) {
505
447
 		value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_RO_MEAN + 4 * i, true);
..
..
@@ -509,33 +451,30 @@
509
451
 	}
510
452
 
511
453
 out:
512
-	rkisp_write(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, ctrl, true);
513
-	return 0;
454
+	value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
455
+	value |= ISP2X_3A_MEAS_DONE;
456
+	rkisp_write(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, value, true);
514
457
 }
515
458
 
516
-static int
459
+static void
517
460
 rkisp_stats_get_rawhstlite_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
518
461
 				    struct rkisp_isp2x_stat_buffer *pbuf)
519
462
 {
520
463
 	struct isp2x_rawhistlite_stat *hst;
521
-	u32 ctrl;
464
+	u32 value;
522
465
 	int i;
523
-
524
-	ctrl = rkisp_read(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, true);
525
-	if (!(ctrl & ISP2X_3A_MEAS_DONE))
526
-		return -ENODATA;
527
466
 
528
467
 	if (!pbuf)
529
468
 		goto out;
530
469
 
531
-	pbuf->meas_type |= ISP2X_STAT_RAWHST0;
532
470
 	hst = &pbuf->params.rawhist0;
533
471
 	for (i = 0; i < ISP2X_HIST_BIN_N_MAX; i++)
534
472
 		hst->hist_bin[i] = rkisp_read(stats_vdev->dev, ISP_RAWHIST_LITE_RO_BASE_BIN, true);
535
473
 
536
474
 out:
537
-	rkisp_write(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, ctrl, true);
538
-	return 0;
475
+	value = rkisp_read(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, true);
476
+	value |= ISP2X_3A_MEAS_DONE;
477
+	rkisp_write(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, value, true);
539
478
 }
540
479
 
541
480
 static void
..
..
@@ -723,7 +662,7 @@
723
662
 		ISP2X_SIAWB_GET_MEAN_Y_G(reg_val);
724
663
 }
725
664
 
726
-static int
665
+static void
727
666
 rkisp_stats_get_rawawb_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
728
667
 				struct rkisp_isp2x_stat_buffer *pbuf)
729
668
 {
..
..
@@ -733,7 +672,7 @@
733
672
 	u32 i;
734
673
 
735
674
 	if (!pbuf)
736
-		goto out;
675
+		goto OUT;
737
676
 
738
677
 	pbuf->meas_type |= ISP2X_STAT_RAWAWB;
739
678
 
..
..
@@ -830,11 +769,10 @@
830
769
 	pbuf->params.rawawb.ramdata[2 * i].r = (msb & 0x3FFFF0) >> 4;
831
770
 	pbuf->params.rawawb.ramdata[2 * i].wp = (msb & 0x01C00000) >> 22;
832
771
 
833
-out:
772
+OUT:
834
773
 	value = rkisp_read(stats_vdev->dev, ISP_RAWAWB_CTRL, true);
835
774
 	value |= ISP2X_3A_MEAS_DONE;
836
775
 	rkisp_write(stats_vdev->dev, ISP_RAWAWB_CTRL, value, true);
837
-	return 0;
838
776
 }
839
777
 
840
778
 static void
..
..
@@ -861,7 +799,7 @@
861
799
 	af->win[2].lum = ddr_addr[6];
862
800
 }
863
801
 
864
-static int
802
+static void
865
803
 rkisp_stats_get_rawaf_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
866
804
 			       struct rkisp_isp2x_stat_buffer *pbuf)
867
805
 {
..
..
@@ -871,7 +809,7 @@
871
809
 	int i;
872
810
 
873
811
 	if (!pbuf)
874
-		goto out;
812
+		goto OUT;
875
813
 
876
814
 	af = &pbuf->params.rawaf;
877
815
 	pbuf->meas_type |= ISP2X_STAT_RAWAF;
..
..
@@ -888,15 +826,14 @@
888
826
 	for (i = 0; i < ISP2X_RAWAF_SUMDATA_ROW * ISP2X_RAWAF_SUMDATA_COLUMN; i++)
889
827
 		af->ramdata[i] = ddr_addr[i];
890
828
 
891
-out:
829
+OUT:
892
830
 	value = rkisp_read(stats_vdev->dev, ISP_RAWAF_CTRL, true);
893
831
 	value |= ISP2X_3A_MEAS_DONE;
894
832
 	rkisp_write(stats_vdev->dev, ISP_RAWAF_CTRL, value, true);
895
833
 	rkisp_write(stats_vdev->dev, ISP_RAWAF_INT_STATE, 0, true);
896
-	return 0;
897
834
 }
898
835
 
899
-static int
836
+static void
900
837
 rkisp_stats_get_yuvae_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
901
838
 			       struct rkisp_isp2x_stat_buffer *pbuf)
902
839
 {
..
..
@@ -905,7 +842,7 @@
905
842
 	int i;
906
843
 
907
844
 	if (!pbuf)
908
-		goto out;
845
+		goto OUT;
909
846
 
910
847
 	pbuf->meas_type |= ISP2X_STAT_YUVAE;
911
848
 
..
..
@@ -925,11 +862,10 @@
925
862
 		pbuf->params.yuvae.ro_yuvae_sumy[i] =
926
863
 			rkisp_read(stats_vdev->dev, ISP_YUVAE_WND1_SUMY + 4 * i, true);
927
864
 
928
-out:
865
+OUT:
929
866
 	value = rkisp_read(stats_vdev->dev, ISP_YUVAE_CTRL, true);
930
867
 	value |= ISP2X_3A_MEAS_DONE;
931
868
 	rkisp_write(stats_vdev->dev, ISP_YUVAE_CTRL, value, true);
932
-	return 0;
933
869
 }
934
870
 
935
871
 static void
..
..
@@ -960,7 +896,7 @@
960
896
 	}
961
897
 }
962
898
 
963
-static int
899
+static void
964
900
 rkisp_stats_get_rawaebig_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
965
901
 				  struct isp2x_rawaebig_stat *ae, u32 blk_no)
966
902
 {
..
..
@@ -987,7 +923,7 @@
987
923
 	}
988
924
 
989
925
 	if (!ae)
990
-		goto out;
926
+		goto OUT;
991
927
 
992
928
 	for (i = 0; i < ISP2X_RAWAEBIG_SUBWIN_NUM; i++)
993
929
 		ae->sumr[i] = rkisp_read(stats_vdev->dev, addr + RAWAE_BIG_WND1_SUMR + i * 4, true);
..
..
@@ -1005,14 +941,13 @@
1005
941
 		ae->data[i].channelr_xy = ISP2X_RAWAEBIG_GET_MEAN_R(value);
1006
942
 	}
1007
943
 
1008
-out:
944
+OUT:
1009
945
 	value = rkisp_read(stats_vdev->dev, addr + RAWAE_BIG_CTRL, true);
1010
946
 	value |= ISP2X_3A_MEAS_DONE;
1011
947
 	rkisp_write(stats_vdev->dev, addr + RAWAE_BIG_CTRL, value, true);
1012
-	return 0;
1013
948
 }
1014
949
 
1015
-static int
950
+static void
1016
951
 rkisp_stats_get_rawhstbig_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1017
952
 				   struct isp2x_rawhistbig_stat *hst, u32 blk_no)
1018
953
 {
..
..
@@ -1039,121 +974,78 @@
1039
974
 	}
1040
975
 
1041
976
 	if (!hst)
1042
-		goto out;
977
+		goto OUT;
1043
978
 
1044
979
 	for (i = 0; i < ISP2X_HIST_BIN_N_MAX; i++)
1045
980
 		hst->hist_bin[i] = ddr_addr[i];
1046
981
 
1047
-out:
982
+OUT:
1048
983
 	value = rkisp_read(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, true);
1049
984
 	value |= ISP2X_3A_MEAS_DONE;
1050
985
 	rkisp_write(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, value, true);
1051
-	return 0;
1052
986
 }
1053
987
 
1054
-static int
988
+static void
1055
989
 rkisp_stats_get_rawae1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1056
990
 				struct rkisp_isp2x_stat_buffer *pbuf)
1057
991
 {
1058
-	int ret = 0;
1059
-
1060
-	if (!pbuf) {
992
+	if (!pbuf)
1061
993
 		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 1);
1062
-	} else {
1063
-		ret = rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae1, 1);
1064
-		if (!ret)
1065
-			pbuf->meas_type |= ISP2X_STAT_RAWAE1;
1066
-	}
1067
-
1068
-	return ret;
994
+	else
995
+		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae1, 1);
1069
996
 }
1070
997
 
1071
-static int
998
+static void
1072
999
 rkisp_stats_get_rawhst1_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1073
1000
 				 struct rkisp_isp2x_stat_buffer *pbuf)
1074
1001
 {
1075
-	int ret = 0;
1076
-
1077
-	if (!pbuf) {
1002
+	if (!pbuf)
1078
1003
 		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 1);
1079
-	} else {
1080
-		ret = rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist1, 1);
1081
-		if (!ret)
1082
-			pbuf->meas_type |= ISP2X_STAT_RAWHST1;
1083
-	}
1084
-
1085
-	return ret;
1004
+	else
1005
+		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist1, 1);
1086
1006
 }
1087
1007
 
1088
-static int
1008
+static void
1089
1009
 rkisp_stats_get_rawae2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1090
1010
 				struct rkisp_isp2x_stat_buffer *pbuf)
1091
1011
 {
1092
-	int ret = 0;
1093
-
1094
-	if (!pbuf) {
1012
+	if (!pbuf)
1095
1013
 		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 2);
1096
-	} else {
1097
-		ret = rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae2, 2);
1098
-		if (!ret)
1099
-			pbuf->meas_type |= ISP2X_STAT_RAWAE2;
1100
-	}
1101
-
1102
-	return ret;
1014
+	else
1015
+		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae2, 2);
1103
1016
 }
1104
1017
 
1105
-static int
1018
+static void
1106
1019
 rkisp_stats_get_rawhst2_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1107
1020
 				 struct rkisp_isp2x_stat_buffer *pbuf)
1108
1021
 {
1109
-	int ret = 0;
1110
-
1111
-	if (!pbuf) {
1022
+	if (!pbuf)
1112
1023
 		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 2);
1113
-	} else {
1114
-		ret = rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist2, 2);
1115
-		if (!ret)
1116
-			pbuf->meas_type |= ISP2X_STAT_RAWHST2;
1117
-	}
1118
-
1119
-	return ret;
1024
+	else
1025
+		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist2, 2);
1120
1026
 }
1121
1027
 
1122
-static int
1028
+static void
1123
1029
 rkisp_stats_get_rawae3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1124
1030
 				struct rkisp_isp2x_stat_buffer *pbuf)
1125
1031
 {
1126
-	int ret = 0;
1127
-
1128
-	if (!pbuf) {
1032
+	if (!pbuf)
1129
1033
 		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, NULL, 0);
1130
-	} else {
1034
+	else
1131
1035
 		rkisp_stats_get_rawaebig_meas_ddr(stats_vdev, &pbuf->params.rawae3, 0);
1132
-		if (!ret)
1133
-			pbuf->meas_type |= ISP2X_STAT_RAWAE3;
1134
-	}
1135
-
1136
-	return ret;
1137
1036
 }
1138
1037
 
1139
-static int
1038
+static void
1140
1039
 rkisp_stats_get_rawhst3_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1141
1040
 				 struct rkisp_isp2x_stat_buffer *pbuf)
1142
1041
 {
1143
-	int ret = 0;
1144
-
1145
-	if (!pbuf) {
1042
+	if (!pbuf)
1146
1043
 		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, NULL, 0);
1147
-	} else {
1148
-		ret = rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist3, 0);
1149
-		if (!ret)
1150
-			pbuf->meas_type |= ISP2X_STAT_RAWHST3;
1151
-	}
1152
-
1153
-	return ret;
1044
+	else
1045
+		rkisp_stats_get_rawhstbig_meas_ddr(stats_vdev, &pbuf->params.rawhist3, 0);
1154
1046
 }
1155
1047
 
1156
-static int
1048
+static void
1157
1049
 rkisp_stats_get_rawaelite_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1158
1050
 				   struct rkisp_isp2x_stat_buffer *pbuf)
1159
1051
 {
..
..
@@ -1163,10 +1055,13 @@
1163
1055
 	int i;
1164
1056
 
1165
1057
 	if (!pbuf)
1166
-		goto out;
1058
+		goto OUT;
1167
1059
 
1168
-	pbuf->meas_type |= ISP2X_STAT_RAWAE0;
1169
1060
 	ae = &pbuf->params.rawae0;
1061
+	value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
1062
+	if ((value & ISP2X_3A_MEAS_DONE) == 0)
1063
+		return;
1064
+
1170
1065
 	rd_buf_idx = stats_vdev->rd_buf_idx;
1171
1066
 	ddr_addr = stats_vdev->stats_buf[rd_buf_idx].vaddr + 0x0AB0;
1172
1067
 	for (i = 0; i < ISP2X_RAWAELITE_MEAN_NUM; i++) {
..
..
@@ -1176,14 +1071,13 @@
1176
1071
 		ae->data[i].channelr_xy = ISP2X_RAWAEBIG_GET_MEAN_R(value);
1177
1072
 	}
1178
1073
 
1179
-out:
1074
+OUT:
1180
1075
 	value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
1181
1076
 	value |= ISP2X_3A_MEAS_DONE;
1182
1077
 	rkisp_write(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, value, true);
1183
-	return 0;
1184
1078
 }
1185
1079
 
1186
-static int
1080
+static void
1187
1081
 rkisp_stats_get_rawhstlite_meas_ddr(struct rkisp_isp_stats_vdev *stats_vdev,
1188
1082
 				    struct rkisp_isp2x_stat_buffer *pbuf)
1189
1083
 {
..
..
@@ -1193,9 +1087,8 @@
1193
1087
 	int i;
1194
1088
 
1195
1089
 	if (!pbuf)
1196
-		goto out;
1090
+		goto OUT;
1197
1091
 
1198
-	pbuf->meas_type |= ISP2X_STAT_RAWHST0;
1199
1092
 	hst = &pbuf->params.rawhist0;
1200
1093
 
1201
1094
 	rd_buf_idx = stats_vdev->rd_buf_idx;
..
..
@@ -1204,11 +1097,10 @@
1204
1097
 	for (i = 0; i < ISP2X_HIST_BIN_N_MAX; i++)
1205
1098
 		hst->hist_bin[i] = ddr_addr[i];
1206
1099
 
1207
-out:
1100
+OUT:
1208
1101
 	value = rkisp_read(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, true);
1209
1102
 	value |= ISP2X_3A_MEAS_DONE;
1210
1103
 	rkisp_write(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, value, true);
1211
-	return 0;
1212
1104
 }
1213
1105
 
1214
1106
 static struct rkisp_stats_v2x_ops __maybe_unused rkisp_stats_ddr_ops_v2x = {
..
..
@@ -1237,15 +1129,14 @@
1237
1129
 {
1238
1130
 	unsigned int cur_frame_id = -1;
1239
1131
 	struct rkisp_isp2x_stat_buffer *cur_stat_buf = NULL;
1240
-	struct rkisp_buffer *cur_buf = stats_vdev->cur_buf;
1132
+	struct rkisp_buffer *cur_buf = NULL;
1241
1133
 	struct rkisp_stats_v2x_ops *ops =
1242
1134
 		(struct rkisp_stats_v2x_ops *)stats_vdev->priv_ops;
1243
-	int ret = 0;
1244
1135
 
1245
1136
 	cur_frame_id = meas_work->frame_id;
1246
1137
 	spin_lock(&stats_vdev->rd_lock);
1247
1138
 	/* get one empty buffer */
1248
-	if (!cur_buf && !list_empty(&stats_vdev->stat)) {
1139
+	if (!list_empty(&stats_vdev->stat)) {
1249
1140
 		cur_buf = list_first_entry(&stats_vdev->stat,
1250
1141
 					   struct rkisp_buffer, queue);
1251
1142
 		list_del(&cur_buf->queue);
..
..
@@ -1258,11 +1149,18 @@
1258
1149
 		cur_stat_buf->frame_id = cur_frame_id;
1259
1150
 	}
1260
1151
 
1261
-	if (meas_work->isp_ris & ISP2X_SIAWB_DONE)
1152
+	if (meas_work->isp_ris & ISP2X_SIAWB_DONE) {
1262
1153
 		ops->get_siawb_meas(stats_vdev, cur_stat_buf);
1263
1154
 
1264
-	if (meas_work->isp_ris & ISP2X_SIAF_FIN)
1155
+		if (cur_stat_buf)
1156
+			cur_stat_buf->meas_type |= ISP2X_STAT_SIAWB;
1157
+	}
1158
+
1159
+	if (meas_work->isp_ris & ISP2X_SIAF_FIN) {
1265
1160
 		ops->get_siaf_meas(stats_vdev, cur_stat_buf);
1161
+		if (cur_stat_buf)
1162
+			cur_stat_buf->meas_type |= ISP2X_STAT_SIAF;
1163
+	}
1266
1164
 
1267
1165
 	if (meas_work->isp_ris & ISP2X_AFM_SUM_OF)
1268
1166
 		v4l2_warn(stats_vdev->vnode.vdev.v4l2_dev,
..
..
@@ -1272,17 +1170,29 @@
1272
1170
 		v4l2_warn(stats_vdev->vnode.vdev.v4l2_dev,
1273
1171
 			  "ISP2X_AFM_LUM_OF\n");
1274
1172
 
1275
-	if (meas_work->isp_ris & ISP2X_YUVAE_END)
1276
-		ret |= ops->get_yuvae_meas(stats_vdev, cur_stat_buf);
1173
+	if (meas_work->isp_ris & ISP2X_YUVAE_END) {
1174
+		ops->get_yuvae_meas(stats_vdev, cur_stat_buf);
1175
+		if (cur_stat_buf)
1176
+			cur_stat_buf->meas_type |= ISP2X_STAT_YUVAE;
1177
+	}
1277
1178
 
1278
-	if (meas_work->isp_ris & ISP2X_SIHST_RDY)
1179
+	if (meas_work->isp_ris & ISP2X_SIHST_RDY) {
1279
1180
 		ops->get_sihst_meas(stats_vdev, cur_stat_buf);
1181
+		if (cur_stat_buf)
1182
+			cur_stat_buf->meas_type |= ISP2X_STAT_SIHST;
1183
+	}
1280
1184
 
1281
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAWB)
1282
-		ret |= ops->get_rawawb_meas(stats_vdev, cur_stat_buf);
1185
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAWB) {
1186
+		ops->get_rawawb_meas(stats_vdev, cur_stat_buf);
1187
+		if (cur_stat_buf)
1188
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAWB;
1189
+	}
1283
1190
 
1284
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAF)
1285
-		ret |= ops->get_rawaf_meas(stats_vdev, cur_stat_buf);
1191
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAF) {
1192
+		ops->get_rawaf_meas(stats_vdev, cur_stat_buf);
1193
+		if (cur_stat_buf)
1194
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAF;
1195
+	}
1286
1196
 
1287
1197
 	if (meas_work->isp3a_ris & ISP2X_3A_RAWAF_SUM)
1288
1198
 		v4l2_warn(stats_vdev->vnode.vdev.v4l2_dev,
..
..
@@ -1292,29 +1202,53 @@
1292
1202
 		v4l2_warn(stats_vdev->vnode.vdev.v4l2_dev,
1293
1203
 			  "ISP2X_3A_RAWAF_LUM\n");
1294
1204
 
1295
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_BIG)
1296
-		ret |= ops->get_rawae3_meas(stats_vdev, cur_stat_buf);
1205
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_BIG) {
1206
+		ops->get_rawae3_meas(stats_vdev, cur_stat_buf);
1207
+		if (cur_stat_buf)
1208
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE3;
1209
+	}
1297
1210
 
1298
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_BIG)
1299
-		ret |= ops->get_rawhst3_meas(stats_vdev, cur_stat_buf);
1211
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_BIG) {
1212
+		ops->get_rawhst3_meas(stats_vdev, cur_stat_buf);
1213
+		if (cur_stat_buf)
1214
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST3;
1215
+	}
1300
1216
 
1301
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH0)
1302
-		ret |= ops->get_rawae0_meas(stats_vdev, cur_stat_buf);
1217
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH0) {
1218
+		ops->get_rawae0_meas(stats_vdev, cur_stat_buf);
1219
+		if (cur_stat_buf)
1220
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE0;
1221
+	}
1303
1222
 
1304
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH1)
1305
-		ret |= ops->get_rawae1_meas(stats_vdev, cur_stat_buf);
1223
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH1) {
1224
+		ops->get_rawae1_meas(stats_vdev, cur_stat_buf);
1225
+		if (cur_stat_buf)
1226
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE1;
1227
+	}
1306
1228
 
1307
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH2)
1308
-		ret |= ops->get_rawae2_meas(stats_vdev, cur_stat_buf);
1229
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWAE_CH2) {
1230
+		ops->get_rawae2_meas(stats_vdev, cur_stat_buf);
1231
+		if (cur_stat_buf)
1232
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWAE2;
1233
+	}
1309
1234
 
1310
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH0)
1311
-		ret |= ops->get_rawhst0_meas(stats_vdev, cur_stat_buf);
1235
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH0) {
1236
+		ops->get_rawhst0_meas(stats_vdev, cur_stat_buf);
1237
+		if (cur_stat_buf)
1238
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST0;
1239
+	}
1312
1240
 
1313
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH1)
1314
-		ret |= ops->get_rawhst1_meas(stats_vdev, cur_stat_buf);
1241
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH1) {
1242
+		ops->get_rawhst1_meas(stats_vdev, cur_stat_buf);
1243
+		if (cur_stat_buf)
1244
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST1;
1245
+	}
1315
1246
 
1316
-	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH2)
1317
-		ret |= ops->get_rawhst2_meas(stats_vdev, cur_stat_buf);
1247
+	if (meas_work->isp3a_ris & ISP2X_3A_RAWHIST_CH2) {
1248
+		ops->get_rawhst2_meas(stats_vdev, cur_stat_buf);
1249
+		if (cur_stat_buf)
1250
+			cur_stat_buf->meas_type |= ISP2X_STAT_RAWHST2;
1251
+	}
1318
1252
 
1319
1253
 	if (meas_work->isp_ris & ISP2X_FRAME) {
1320
1254
 		ops->get_bls_stats(stats_vdev, cur_stat_buf);
..
..
@@ -1322,7 +1256,7 @@
1322
1256
 		ops->get_dhaz_stats(stats_vdev, cur_stat_buf);
1323
1257
 	}
1324
1258
 
1325
-	if (cur_buf && !ret) {
1259
+	if (cur_buf) {
1326
1260
 		bool reg_withstream = false;
1327
1261
 		struct v4l2_subdev *sd = v4l2_get_subdev_hostdata(&stats_vdev->dev->br_dev.sd);
1328
1262
 
..
..
@@ -1339,9 +1273,7 @@
1339
1273
 				memcpy(tmp_statsbuf, cur_stat_buf, sizeof(*cur_stat_buf));
1340
1274
 		}
1341
1275
 		vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
1342
-		cur_buf = NULL;
1343
1276
 	}
1344
-	stats_vdev->cur_buf = cur_buf;
1345
1277
 }
1346
1278
 
1347
1279
 static void
..
..
@@ -1447,7 +1379,7 @@
1447
1379
 	if ((isp_ris & ISP2X_FRAME) && stats_vdev->rd_stats_from_ddr) {
1448
1380
 		wr_buf_idx = stats_vdev->wr_buf_idx;
1449
1381
 		stats_vdev->rd_buf_idx = wr_buf_idx;
1450
-		rkisp_finish_buffer(dev, &stats_vdev->stats_buf[wr_buf_idx]);
1382
+
1451
1383
 		wr_buf_idx = (wr_buf_idx + 1) % RKISP_STATS_DDR_BUF_NUM;
1452
1384
 		stats_vdev->wr_buf_idx = wr_buf_idx;
1453
1385
 		rkisp_write(stats_vdev->dev, MI_DBR_WR_SIZE,
..
..
@@ -1474,9 +1406,20 @@
1474
1406
 		work.frame_id = cur_frame_id;
1475
1407
 		work.isp_ris = temp_isp_ris | isp_ris;
1476
1408
 		work.isp3a_ris = temp_isp3a_ris | iq_3a_mask;
1477
-		work.timestamp = ktime_get_ns();
1409
+		work.timestamp = rkisp_time_get_ns(dev);
1478
1410
 
1479
-		rkisp_stats_send_meas_v2x(stats_vdev, &work);
1411
+		if (!IS_HDR_RDBK(dev->hdr.op_mode)) {
1412
+			if (!kfifo_is_full(&stats_vdev->rd_kfifo))
1413
+				kfifo_in(&stats_vdev->rd_kfifo,
1414
+					 &work, sizeof(work));
1415
+			else
1416
+				v4l2_err(stats_vdev->vnode.vdev.v4l2_dev,
1417
+					 "stats kfifo is full\n");
1418
+
1419
+			tasklet_schedule(&stats_vdev->rd_tasklet);
1420
+		} else {
1421
+			rkisp_stats_send_meas_v2x(stats_vdev, &work);
1422
+		}
1480
1423
 	}
1481
1424
 
1482
1425
 	/*