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

video: driver: fix some checker err

Browse Source 
Fix some checker err

Change-Id: I357059999dd43b58d6c414868a8b4060b6b691da
Signed-off-by: Anshul Agarwal <quic_anshagar@quicinc.com>
This commit is contained in:
Anshul Agarwal
2023-06-09 11:14:25 +05:30
parent 6cfd5c6a02
commit 950306d1aa
8 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/variant/iris3/src/msm_vidc_bus_iris3.c
View File

@@ -608,7 +608,7 @@ static int calculate_bandwidth_encoder_iris3(
(codec_input.codec == CODEC_H264_CAVLC)) { (codec_input.codec == CODEC_H264_CAVLC)) {
frame_lcu_size = 16; frame_lcu_size = 16;
collocated_bytes_per_lcu = 16; collocated_bytes_per_lcu = 16;
} if (codec_input.codec == CODEC_HEVC) { } else if (codec_input.codec == CODEC_HEVC) {
frame_lcu_size = 32; frame_lcu_size = 32;
collocated_bytes_per_lcu = 64; collocated_bytes_per_lcu = 64;
} else { } else {

2
driver/variant/iris33/src/msm_vidc_bus_iris33.c
View File

@@ -608,7 +608,7 @@ static int calculate_bandwidth_encoder_iris33(
(codec_input.codec == CODEC_H264_CAVLC)) { (codec_input.codec == CODEC_H264_CAVLC)) {
frame_lcu_size = 16; frame_lcu_size = 16;
collocated_bytes_per_lcu = 16; collocated_bytes_per_lcu = 16;
} if (codec_input.codec == CODEC_HEVC) { } else if (codec_input.codec == CODEC_HEVC) {
frame_lcu_size = 32; frame_lcu_size = 32;
collocated_bytes_per_lcu = 64; collocated_bytes_per_lcu = 64;
} else { } else {

6
driver/variant/iris33/src/msm_vidc_iris33.c
View File

@@ -38,8 +38,7 @@
#define HFI_CTRL_INIT_IRIS33 VCODEC_VPU_CPU_CS_SCIACMD_IRIS33 #define HFI_CTRL_INIT_IRIS33 VCODEC_VPU_CPU_CS_SCIACMD_IRIS33
#define HFI_CTRL_STATUS_IRIS33 VCODEC_VPU_CPU_CS_SCIACMDARG0_IRIS33 #define HFI_CTRL_STATUS_IRIS33 VCODEC_VPU_CPU_CS_SCIACMDARG0_IRIS33
typedef enum typedef enum {
{
HFI_CTRL_NOT_INIT = 0x0, HFI_CTRL_NOT_INIT = 0x0,
HFI_CTRL_READY = 0x1, HFI_CTRL_READY = 0x1,
HFI_CTRL_ERROR_FATAL = 0x2, HFI_CTRL_ERROR_FATAL = 0x2,
@@ -50,8 +49,7 @@ typedef enum
} hfi_ctrl_status_type; } hfi_ctrl_status_type;
#define HFI_QTBL_INFO_IRIS33 VCODEC_VPU_CPU_CS_SCIACMDARG1_IRIS33 #define HFI_QTBL_INFO_IRIS33 VCODEC_VPU_CPU_CS_SCIACMDARG1_IRIS33
typedef enum typedef enum {
{
HFI_QTBL_DISABLED = 0x00, HFI_QTBL_DISABLED = 0x00,
HFI_QTBL_ENABLED = 0x01, HFI_QTBL_ENABLED = 0x01,
} hfi_qtbl_status_type; } hfi_qtbl_status_type;

4
driver/vidc/inc/venus_hfi_queue.h
View File

@@ -63,8 +63,8 @@ struct hfi_queue_header {
VIDC_IFACEQ_MAX_BUF_COUNT * VIDC_IFACE_MAX_PARALLEL_CLNTS) VIDC_IFACEQ_MAX_BUF_COUNT * VIDC_IFACE_MAX_PARALLEL_CLNTS)
#define VIDC_IFACEQ_GET_QHDR_START_ADDR(ptr, i) \ #define VIDC_IFACEQ_GET_QHDR_START_ADDR(ptr, i) \
(void *)((ptr + sizeof(struct hfi_queue_table_header)) + \ ((void *)((ptr + sizeof(struct hfi_queue_table_header)) + \
(i * sizeof(struct hfi_queue_header))) (i * sizeof(struct hfi_queue_header))))
#define QDSS_SIZE 4096 #define QDSS_SIZE 4096
#define SFR_SIZE 4096 #define SFR_SIZE 4096

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

@@ -25,7 +25,7 @@ unsigned int msm_vidc_debug = DRV_LOG;
unsigned int msm_fw_debug = FW_LOG; unsigned int msm_fw_debug = FW_LOG;
/* disabled synx fence by default temporarily */ /* disabled synx fence by default temporarily */
bool msm_vidc_synx_fence_enable = false; bool msm_vidc_synx_fence_enable;
static int debug_level_set_drv(const char *val, static int debug_level_set_drv(const char *val,
const struct kernel_param *kp) const struct kernel_param *kp)
@@ -405,8 +405,7 @@ static ssize_t trigger_ssr_write(struct file *filp, const char __user *buf,
if (rc) { if (rc) {
d_vpr_e("returning error err %d\n", rc); d_vpr_e("returning error err %d\n", rc);
rc = -EINVAL; rc = -EINVAL;
} } else {
else {
msm_vidc_trigger_ssr(core, ssr_trigger_val); msm_vidc_trigger_ssr(core, ssr_trigger_val);
rc = count; rc = count;
} }

8
driver/vidc/src/msm_vidc_driver.c
View File

@@ -999,7 +999,7 @@ bool is_hevc_10bit_decode_session(struct msm_vidc_inst *inst)
/* in case of decoder session return false */ /* in case of decoder session return false */
if (!is_decode_session(inst)) if (!is_decode_session(inst))
return false; return false;
colorformat = v4l2_colorformat_to_driver(inst, colorformat = v4l2_colorformat_to_driver(inst,
inst->fmts[OUTPUT_PORT].fmt.pix_mp.pixelformat, __func__); inst->fmts[OUTPUT_PORT].fmt.pix_mp.pixelformat, __func__);
@@ -4934,8 +4934,8 @@ static int msm_vidc_get_inst_load(struct msm_vidc_inst *inst)
return mbpf * fps; return mbpf * fps;
} }
static bool msm_vidc_ignore_session_load(struct msm_vidc_inst *inst) { static bool msm_vidc_ignore_session_load(struct msm_vidc_inst *inst)
{
if (!is_realtime_session(inst) || is_thumbnail_session(inst) || if (!is_realtime_session(inst) || is_thumbnail_session(inst) ||
is_image_session(inst) || is_session_error(inst)) is_image_session(inst) || is_session_error(inst))
return true; return true;
@@ -5010,7 +5010,7 @@ int msm_vidc_check_core_mbps(struct msm_vidc_inst *inst)
} }
core_unlock(core, __func__); core_unlock(core, __func__);
} }
} else if (is_decode_session(inst)){ } else if (is_decode_session(inst)) {
/* /*
* if total_mbps is greater than max_mbps then allow this * if total_mbps is greater than max_mbps then allow this
* decoder by reducing its piority (moving it to NRT) * decoder by reducing its piority (moving it to NRT)

2
driver/vidc/src/resources.c
View File

@@ -1265,7 +1265,7 @@ static int update_residency_stats(
int rc = 0; int rc = 0;
/* skip update if high or stats logs not enabled */ /* skip update if high or stats logs not enabled */
if(!(msm_vidc_debug & (VIDC_HIGH | VIDC_STAT))) if (!(msm_vidc_debug & (VIDC_HIGH | VIDC_STAT)))
return 0; return 0;
if (!core || !cl) { if (!core || !cl) {

2
driver/vidc/src/resources_ext.c
View File

@@ -338,7 +338,7 @@ static int update_residency_stats(
int rc = 0; int rc = 0;
/* skip update if high or stats logs not enabled */ /* skip update if high or stats logs not enabled */
if(!(msm_vidc_debug & (VIDC_HIGH | VIDC_STAT))) if (!(msm_vidc_debug & (VIDC_HIGH | VIDC_STAT)))
return 0; return 0;
if (!core || !cl) { if (!core || !cl) {