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: I3526a509f4cbb3d91284b21dad851b57bb43f57a
Signed-off-by: Anshul Agarwal <quic_anshagar@quicinc.com>
This commit is contained in:
Anshul Agarwal
2023-07-14 14:48:39 +05:30
parent 50a257d310
commit 2576adf412
11 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/platform/kalama/inc/kalama_technology.h
View File

@@ -226,7 +226,7 @@ static u32 av1_num_tiles_kalama[7][3] = {
* *
* Total W = SUMPRODUCT(H16:J16, K16 : M16) / SUM(H16:J16) * Total W = SUMPRODUCT(H16:J16, K16 : M16) / SUM(H16:J16)
* Total R = SUMPRODUCT(H16:J16, N16 : P16) / SUM(H16:J16) * Total R = SUMPRODUCT(H16:J16, N16 : P16) / SUM(H16:J16)
*/ */
/* 1000x */ /* 1000x */
static u32 kalama_en_readfactor[7] = {1000, 1500, 1750, 1875, 1000, 2000, 2000}; static u32 kalama_en_readfactor[7] = {1000, 1500, 1750, 1875, 1000, 2000, 2000};

11
driver/platform/kalama/src/msm_vidc_kalama.c
View File

@@ -290,11 +290,12 @@ static struct msm_platform_core_capability core_data_kalama[] = {
{MAX_SECURE_SESSION_COUNT, 3}, {MAX_SECURE_SESSION_COUNT, 3},
{MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/
{MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */
{MAX_MBPS, 7833600}, /* max_load {MAX_MBPS, 7833600},
* 7680x4320@60fps or 3840x2176@240fps /* max_load
* which is greater than 4096x2176@120fps, * 7680x4320@60fps or 3840x2176@240fps
* 8192x4320@48fps * which is greater than 4096x2176@120fps,
*/ * 8192x4320@48fps
*/
{MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */ {MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */
{MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */
{MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */

11
driver/platform/pineapple/src/msm_vidc_pineapple.c
View File

@@ -292,11 +292,12 @@ static struct msm_platform_core_capability core_data_pineapple[] = {
{MAX_SECURE_SESSION_COUNT, 3}, {MAX_SECURE_SESSION_COUNT, 3},
{MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/
{MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */
{MAX_MBPS, 7833600}, /* max_load {MAX_MBPS, 7833600},
* 7680x4320@60fps or 3840x2176@240fps /* max_load
* which is greater than 4096x2176@120fps, * 7680x4320@60fps or 3840x2176@240fps
* 8192x4320@48fps * which is greater than 4096x2176@120fps,
*/ * 8192x4320@48fps
*/
{MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */ {MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */
{MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */
{MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */

11
driver/platform/pineapple/src/pineapple.c
View File

@@ -196,11 +196,12 @@ static struct msm_platform_core_capability core_data_pineapple[] = {
{MAX_NUM_8K_SESSIONS, 2}, {MAX_NUM_8K_SESSIONS, 2},
{MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/
{MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */
{MAX_MBPS, 7833600}, /* max_load {MAX_MBPS, 7833600},
* 7680x4320@60fps or 3840x2176@240fps /* max_load
* which is greater than 4096x2176@120fps, * 7680x4320@60fps or 3840x2176@240fps
* 8192x4320@48fps * which is greater than 4096x2176@120fps,
*/ * 8192x4320@48fps
*/
{MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */
{MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */
{MAX_MBPF_B_FRAME, 32640}, /* 3840x2176/256 */ {MAX_MBPF_B_FRAME, 32640}, /* 3840x2176/256 */

2
driver/variant/iris2/src/msm_vidc_iris2.c
View File

@@ -674,7 +674,7 @@ static int __noc_error_info_iris2(struct msm_vidc_core *core)
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val);
val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH);
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val);
*/ */
return 0; return 0;
} }

3
driver/variant/iris3/inc/hfi_buffer_iris3.h
View File

@@ -1072,7 +1072,8 @@ _yuv_bufcount_min, is_opb, num_vpp_pipes) \
#define AV1_CABAC_HDR_RATIO_HD_TOT 2 #define AV1_CABAC_HDR_RATIO_HD_TOT 2
#define AV1_CABAC_RES_RATIO_HD_TOT 2 #define AV1_CABAC_RES_RATIO_HD_TOT 2
/* some content need more bin buffer, /* some content need more bin buffer,
* but limit buffer size for high resolution */ * but limit buffer size for high resolution
*/
#define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \ #define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \
num_vpp_pipes) \ num_vpp_pipes) \
do { \ do { \

4
driver/variant/iris3/src/msm_vidc_iris3.c
View File

@@ -721,7 +721,7 @@ static int __noc_error_info_iris3(struct msm_vidc_core *core)
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val);
val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH);
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val);
*/ */
return 0; return 0;
} }
@@ -977,7 +977,7 @@ int msm_vidc_adjust_bitrate_boost_iris3(void *instance, struct v4l2_ctrl *ctrl)
* honor client set bitrate boost * honor client set bitrate boost
* if client did not set, keep max bitrate boost upto 4k@60fps * if client did not set, keep max bitrate boost upto 4k@60fps
* and remove bitrate boost after 4k@60fps * and remove bitrate boost after 4k@60fps
*/ */
if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) { if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) {
/* accept client set bitrate boost value as is */ /* accept client set bitrate boost value as is */
} else { } else {

3
driver/variant/iris33/inc/hfi_buffer_iris33.h
View File

@@ -1072,7 +1072,8 @@ _yuv_bufcount_min, is_opb, num_vpp_pipes) \
#define AV1_CABAC_HDR_RATIO_HD_TOT 2 #define AV1_CABAC_HDR_RATIO_HD_TOT 2
#define AV1_CABAC_RES_RATIO_HD_TOT 2 #define AV1_CABAC_RES_RATIO_HD_TOT 2
/* some content need more bin buffer, /* some content need more bin buffer,
* but limit buffer size for high resolution */ * but limit buffer size for high resolution
*/
#define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \ #define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \
num_vpp_pipes) \ num_vpp_pipes) \
do { \ do { \

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

@@ -916,7 +916,7 @@ static int __noc_error_info_iris33(struct msm_vidc_core *core)
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val);
val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH);
d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val);
*/ */
if (is_iris33_hw_power_collapsed(core)) { if (is_iris33_hw_power_collapsed(core)) {
d_vpr_e("%s: video hardware already power collapsed\n", __func__); d_vpr_e("%s: video hardware already power collapsed\n", __func__);
@@ -1258,7 +1258,7 @@ int msm_vidc_adjust_bitrate_boost_iris33(void *instance, struct v4l2_ctrl *ctrl)
* honor client set bitrate boost * honor client set bitrate boost
* if client did not set, keep max bitrate boost upto 4k@60fps * if client did not set, keep max bitrate boost upto 4k@60fps
* and remove bitrate boost after 4k@60fps * and remove bitrate boost after 4k@60fps
*/ */
if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) { if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) {
/* accept client set bitrate boost value as is */ /* accept client set bitrate boost value as is */
} else { } else {

14
driver/vidc/src/msm_vdec.c
View File

@@ -310,7 +310,7 @@ static int msm_vdec_set_cabac(struct msm_vidc_inst *inst,
return rc; return rc;
} }
*/ */
static int msm_vdec_set_coded_frames(struct msm_vidc_inst *inst, static int msm_vdec_set_coded_frames(struct msm_vidc_inst *inst,
enum msm_vidc_port_type port) enum msm_vidc_port_type port)
{ {
@@ -1197,12 +1197,12 @@ static int msm_vdec_set_delivery_mode_property(struct msm_vidc_inst *inst,
if (is_meta_rx_inp_enabled(inst, if (is_meta_rx_inp_enabled(inst,
META_OUTBUF_FENCE)) { META_OUTBUF_FENCE)) {
/* /*
* if output buffer fence enabled via * if output buffer fence enabled via
* META_OUTBUF_FENCE, then driver will send * META_OUTBUF_FENCE, then driver will send
* fence id via HFI_PROP_FENCE to firmware. * fence id via HFI_PROP_FENCE to firmware.
* So enable HFI_PROP_FENCE property as * So enable HFI_PROP_FENCE property as
* delivery mode property. * delivery mode property.
*/ */
payload[++count] = payload[++count] =
inst->capabilities[property_output_list[i]].hfi_id; inst->capabilities[property_output_list[i]].hfi_id;
} }

6
driver/vidc/src/msm_vidc_buffer.c
View File

@@ -382,10 +382,12 @@ u32 msm_vidc_encoder_output_size(struct msm_vidc_inst *inst)
frame_size = frame_size << 1; frame_size = frame_size << 1;
if (inst->rc_type == RATE_CONTROL_LOSSLESS) if (inst->rc_type == RATE_CONTROL_LOSSLESS)
frame_size = (width * height * 9) >> 2; */ frame_size = (width * height * 9) >> 2;
*/
skip_calc: skip_calc:
/* multiply by 10/8 (1.25) to get size for 10 bit case */ /* multiply by 10/8 (1.25) to get size for 10 bit case
*/
if (codec == MSM_VIDC_HEVC || codec == MSM_VIDC_HEIC) if (codec == MSM_VIDC_HEVC || codec == MSM_VIDC_HEIC)
frame_size = frame_size + (frame_size >> 2); frame_size = frame_size + (frame_size >> 2);