samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "video: driver: Increase FW timeout to 4sec for debug logging"

Browse Source
This commit is contained in:
qctecmdr
2022-11-09 21:54:22 -08:00
committed by Gerrit - the friendly Code Review server
parent 9db29e4eda bf9dd01f97
commit 643d2e2304
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
driver/vidc/inc/msm_vidc_debug.h
View File

@@ -78,8 +78,14 @@ enum vidc_msg_prio {
FW_PRINTK = 0x10000000,
FW_FTRACE = 0x20000000,
};
#define FW_LOGSHIFT 16
#define FW_LOGMASK 0x0FFF0000
#define DRV_LOG (VIDC_ERR | VIDC_PRINTK)
#define DRV_LOGSHIFT (0)
#define DRV_LOGMASK (0x0FFF)
#define FW_LOG (FW_ERROR | FW_FATAL | FW_PRINTK)
#define FW_LOGSHIFT (16)
#define FW_LOGMASK (0x0FFF0000)
#define dprintk_inst(__level, __level_str, inst, __fmt, ...) \
do { \

13
driver/vidc/src/msm_vidc_debug.c
View File

@@ -19,7 +19,7 @@ extern struct msm_vidc_core *g_core;
#define MSM_VIDC_MIN_STATS_DELAY_MS 200
#define MSM_VIDC_MAX_STATS_DELAY_MS 10000
unsigned int msm_vidc_debug = VIDC_ERR | VIDC_PRINTK | FW_ERROR | FW_FATAL | FW_PRINTK;
unsigned int msm_vidc_debug = (DRV_LOG | FW_LOG);
static int debug_level_set(const char *val,
const struct kernel_param *kp)
@@ -45,11 +45,12 @@ static int debug_level_set(const char *val,
msm_vidc_debug = dvalue;
/* check only driver logmask */
if ((dvalue & 0xFF) > (VIDC_ERR | VIDC_HIGH)) {
core->capabilities[HW_RESPONSE_TIMEOUT].value = 2 * HW_RESPONSE_TIMEOUT_VALUE;
core->capabilities[SW_PC_DELAY].value = 2 * SW_PC_DELAY_VALUE;
core->capabilities[FW_UNLOAD_DELAY].value = 2 * FW_UNLOAD_DELAY_VALUE;
/* check if driver or FW logmask is more than default level */
if (((dvalue & DRV_LOGMASK) & ~(DRV_LOG)) ||
((dvalue & FW_LOGMASK) & ~(FW_LOG))) {
core->capabilities[HW_RESPONSE_TIMEOUT].value = 4 * HW_RESPONSE_TIMEOUT_VALUE;
core->capabilities[SW_PC_DELAY].value = 4 * SW_PC_DELAY_VALUE;
core->capabilities[FW_UNLOAD_DELAY].value = 4 * FW_UNLOAD_DELAY_VALUE;
} else {
/* reset timeout values, if user reduces the logging */
core->capabilities[HW_RESPONSE_TIMEOUT].value = HW_RESPONSE_TIMEOUT_VALUE;