shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

rdma: fix mk_zapper32.sh build error [1/1]

Browse Source 
PD#SWPL-175577

Problem:
fix mk_zapper32.sh build error

Solution:
fix mk_zapper32.sh build error

Verify:
s7d

Change-Id: Ifd3fe93423b062fa2832a043c377eacdabcfecaa
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
This commit is contained in:
Pengcheng Chen
2024-07-09 15:08:11 +08:00
committed by gerrit autosubmit
parent 1cbe27fd43
commit 1dfe63410d
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/video_sink/video_func.c
+2 -1
View File
@@ -3873,12 +3873,12 @@ static void force_switch_slice(void)
bool force_switch_to_2slice(void)
{
#ifndef CONFIG_AMLOGIC_ZAPPER_CUT
const struct vinfo_s *vinfo = get_current_vinfo();
u32 slice_num;
if (!video_is_meson_t3x_cpu())
return false;
if (vinfo && (vinfo->width > 1920 && vinfo->height > 1080 &&
(vinfo->sync_duration_num /
vinfo->sync_duration_den > 60))) {
@@ -3903,6 +3903,7 @@ bool force_switch_to_2slice(void)
return true;
}
}
#endif
return false;
}
#endif
drivers/media/video_sink/video_multi_vsync.c
+2 -2
View File
@@ -76,13 +76,13 @@ bool is_vpp2(u8 layer_id)
return false;
}
int is_in_vsync_isr_viu2(void)
int is_in_vsync_isr_viu2(u8 cur_cpuid)
{
return 0;
}
EXPORT_SYMBOL(is_in_vsync_isr_viu2);
int is_in_vsync_isr_viu3(void)
int is_in_vsync_isr_viu3(u8 cur_cpuid)
{
return 0;
}
drivers/media/video_sink/vpp.c
+8 -1
View File
@@ -965,6 +965,7 @@ static bool is_4k2k144hz_out(const struct vinfo_s *vinfo)
return false;
}
#ifndef CONFIG_AMLOGIC_ZAPPER_CUT
static u32 is_video_output_window_overlap(void)
{
struct video_layer_s *layer = NULL;
@@ -1042,9 +1043,11 @@ static bool is_video_input_4k(u8 layer_id)
is_4k_input = true;
return is_4k_input;
}
#endif
static bool is_vskip_adj_need(u8 layer_id)
{
#ifndef CONFIG_AMLOGIC_ZAPPER_CUT
struct video_layer_s *layer = NULL;
struct vpp_frame_par_s *next_frame_par = NULL;
@@ -1085,6 +1088,7 @@ static bool is_vskip_adj_need(u8 layer_id)
}
}
}
#endif
return false;
}
@@ -1158,10 +1162,12 @@ static int vpp_process_speed_check
sync_duration_num =
sync_duration_num * 10 / frc_ratio;
} else {
#ifndef CONFIG_AMLOGIC_ZAPPER_CUT
if ((frc_enable || (slice_num == 2 &&
video_is_meson_t3x_cpu())) && layer_id == 0)
sync_duration_num = vinfo->sync_duration_num * 10 / frc_ratio;
else
#endif
sync_duration_num = vinfo->sync_duration_num;
sync_duration_den = vinfo->sync_duration_den;
}
@@ -4224,6 +4230,7 @@ static void vpp_set_super_scaler
next_frame_par->supsc0_hori_ratio = 0;
next_frame_par->supsc0_vert_ratio = 0;
}
#ifndef CONFIG_AMLOGIC_ZAPPER_CUT
/* for t3x 2 slice mode */
if (video_is_meson_t3x_cpu() &&
slice_num == 2 &&
@@ -4240,7 +4247,7 @@ static void vpp_set_super_scaler
next_frame_par->supsc1_hori_ratio = 1;
next_frame_par->supsc1_vert_ratio = 1;
}
#endif
if (cur_dev->aisr_enable) {
next_frame_par->supsc1_enable = 1;
next_frame_par->supsc1_hori_ratio = 1;