Merge "msm: vidc: fix f/w logging route checking" (3c753584) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/hfi_common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3236,7 +3236,7 @@ static void __process_sys_error(struct venus_hfi_device *device)
		static void __flush_debug_queue(struct venus_hfi_device device, u8 packet)
		{
		bool local_packet = false;
		enum vidc_msg_prio log_level = msm_vidc_debug & FW_LOGMASK;
		enum vidc_msg_prio log_level = msm_vidc_debug;

		if (!device) {
		dprintk(VIDC_ERR, "%s: Invalid params\n", __func__);

+14 −16

Original line number	Diff line number	Diff line
		@@ -90,23 +90,21 @@ extern bool msm_vidc_cvp_usage;

		#define dprintk_firmware(__level, __fmt, ...) \
		do { \
		if (msm_vidc_debug & __level) { \
		if (msm_vidc_debug & FW_FTRACE) { \
		if (__level & FW_FTRACE) { \
		char trace_logbuf[MAX_TRACER_LOG_LENGTH]; \
		int log_length = snprintf(trace_logbuf, \
		MAX_TRACER_LOG_LENGTH, \
		VIDC_DBG_TAG __fmt, \
		get_debug_level_str(__level), \
		"fw", \
		##__VA_ARGS__); \
		trace_msm_vidc_printf(trace_logbuf, \
		log_length); \
		} \
		if (msm_vidc_debug & FW_PRINTK) { \
		if (__level & FW_PRINTK) { \
		pr_info(VIDC_DBG_TAG __fmt, \
		get_debug_level_str(__level), \
		"fw", \
		##__VA_ARGS__); \
		} \
		} \
		} while (0)

		#define dprintk_ratelimit(__level, __fmt, arg...) \