Merge "frc: add frame cnt display [1/1]" into amlogic-5.15-dev

drivers/media/frc/frc_dbg.c

@@ -1103,10 +1103,15 @@ void frc_debug_other_if(struct frc_dev_s *devp, const char *buf, size_t count)
 		if (kstrtoint(parm[1], 10, &val1) == 0)
 			devp->timer_dbg.timer_en = (u8)val1;
 		if (kstrtoint(parm[2], 10, &val1) == 0)
-			devp->timer_dbg.timer_level = (u8)val1;
+			devp->timer_dbg.timer_level = (u16)val1;
 		if (kstrtoint(parm[3], 10, &val1) == 0)
 			devp->timer_dbg.time_interval = (u8)val1;
 		frc_timer_proc(devp);
+	} else if (!strcmp(parm[0], "frm_show")) {
+		if (!parm[1])
+			goto exit;
+		if (kstrtoint(parm[1], 10, &val1) == 0)
+			devp->in_sts.frm_en = val1;
 	}
 exit:
 	kfree(buf_orig);
@@ -1240,7 +1245,8 @@ free_buf:
 // timer
 static enum hrtimer_restart frc_timer_callback(struct hrtimer *timer)
 {
-	u8 i, log, time;
+	u8 i, time;
+	u16 log;
 	u32 reg_val;
 	struct frc_dev_s *devp = get_frc_devp();
 
@@ -1277,3 +1283,70 @@ void frc_timer_proc(struct frc_dev_s *devp)
 	else
 		hrtimer_cancel(&frc_hi_timer);
 }
+
+/* column: 1~8, color: 0~7, number: 0~15 */
+static void update_seg_7_show(u8 enable, u8 column, u8 color, u8 number)
+{
+	u8 value;
+
+	value = ((enable & 0x01) << 7) + ((color & 0x07) << 4) + (number & 0x0F);
+
+	// enable flag_number 2_1 ~ 2_8
+	if (column == 1)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM17_NUM18_NUM21_NUM22,
+			value << 8, 0xFF00);
+	else if (column == 2)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM17_NUM18_NUM21_NUM22,
+			value, 0xFF);
+	else if (column == 3)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM23_NUM24_NUM25_NUM26,
+			value << 24, 0xFF000000);
+	else if (column == 4)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM23_NUM24_NUM25_NUM26,
+			value << 16, 0xFF0000);
+	else if (column == 5)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM23_NUM24_NUM25_NUM26,
+			value << 8, 0xFF00);
+	else if (column == 6)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM23_NUM24_NUM25_NUM26,
+			value, 0xFF);
+	else if (column == 7)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM27_NUM28,
+			value << 24, 0xFF000000);
+	else if (column == 8)
+		UPDATE_FRC_REG_BITS(FRC_MC_SEVEN_FLAG_NUM27_NUM28,
+			value << 16, 0xFF0000);
+}
+
+void frc_dbg_frame_show(struct frc_dev_s *devp)
+{
+	u8 i, enable, tmp_cnt;
+	static u8 pre_flag;
+
+	if (!devp)
+		return;
+
+	enable = devp->in_sts.frm_en;
+
+	if (enable) {
+		// in cnt
+		tmp_cnt = (devp->in_sts.vs_cnt / 100) % 10;
+		update_seg_7_show(1, 1, 1, tmp_cnt);
+		tmp_cnt = (devp->in_sts.vs_cnt / 10) % 10;
+		update_seg_7_show(1, 2, 1, tmp_cnt);
+		tmp_cnt = devp->in_sts.vs_cnt % 10;
+		update_seg_7_show(1, 3, 1, tmp_cnt);
+		// out cnt
+		tmp_cnt = (devp->out_sts.vs_cnt / 100) % 10;
+		update_seg_7_show(1, 6, 2, tmp_cnt);
+		tmp_cnt = (devp->out_sts.vs_cnt / 10) % 10;
+		update_seg_7_show(1, 7, 2, tmp_cnt);
+		tmp_cnt = devp->out_sts.vs_cnt % 10;
+		update_seg_7_show(1, 8, 2, tmp_cnt);
+	} else if (enable == 0 && enable != pre_flag) {
+		for (i = 1; i < 9; i++)
+			update_seg_7_show(0, i, 0, 0);  // clear
+	}
+
+	pre_flag = enable;
+}

drivers/media/frc/frc_dbg.h

@@ -57,5 +57,6 @@ void frc_debug_param_if(struct frc_dev_s *devp, const char *buf, size_t count);
 ssize_t frc_debug_other_if_help(struct frc_dev_s *devp, char *buf);
 void frc_debug_other_if(struct frc_dev_s *devp, const char *buf, size_t count);
 void frc_timer_proc(struct frc_dev_s *devp);
+void frc_dbg_frame_show(struct frc_dev_s *devp);
 
 #endif

drivers/media/frc/frc_drv.h

@@ -114,7 +114,7 @@
 // frc_20240104 open clk when sys resume
 // frc_20240116 frc rdma process optimisation
 
-#define FRC_FW_VER			"2024-0306  high-priority task and timestamp debug"
+#define FRC_FW_VER			"2024-0306 high-priority task and timestamp debug"
 #define FRC_KERDRV_VER                  3205
 
 #define FRC_DEVNO	1
@@ -491,6 +491,7 @@ struct st_frc_in_sts {
 	u8 enable_mute_flag;
 	u8 mute_vsync_cnt;
 	u8 hi_en;
+	u8 frm_en;
 };
 
 struct st_frc_out_sts {
@@ -651,9 +652,8 @@ struct frc_pat_dbg_s {
 
 struct frc_timer_dbg {
 	u8 timer_en;
-	u8 timer_level; // dbg level
 	u8 time_interval;
-	u8 timer_reserved;
+	u16 timer_level; // dbg level
 };
 
 struct frc_dev_s {

drivers/media/frc/frc_proc.c

@@ -50,6 +50,7 @@
 #include "frc_proc.h"
 #include "frc_hw.h"
 #include "frc_rdma.h"
+#include "frc_dbg.h"
 #if IS_ENABLED(CONFIG_AMLOGIC_DEBUG_IOTRACE)
 #include <linux/amlogic/aml_iotrace.h>
 #endif
@@ -411,6 +412,7 @@ void frc_output_tasklet_pro(unsigned long arg)
 		if (devp->ud_dbg.outud_time_en)
 			frc_out_task_print(sched_clock() - timestamp);
 	}
+	frc_dbg_frame_show(devp);
 #if IS_ENABLED(CONFIG_AMLOGIC_DEBUG_IOTRACE)
 	iotrace_misc_record_write(RECORD_TYPE_FRC_OUTPUT_OUT, 0, 0, 0);
 #endif