shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-02 19:23:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

vpp: config the vd1 canvas1 correctly when 3D enabled [1/1]

Browse Source 
PD#TV-3086

Problem:
3D display abnormal. The vd1 canvas1 was incorrect.

Solution:
When enabled 3D function, config vd1 canvas1 correctly

Verify:
x301

Change-Id: I201cda2f33badf1af54ab4f177a17f761c7cea8d
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
This commit is contained in:
Brian Zhu
2019-03-08 23:01:10 +08:00
committed by Jianxin Pan
parent 607bc19f48
commit b00582b23b
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/amlogic/media/video_sink/video.c
View File

@@ -3737,7 +3737,7 @@ static void vsync_toggle_frame(struct vframe_s *vf)
vf->plane_num,
&disp_canvas_index[rdma_canvas_id][0]);
}
if (is_mvc) {
if (is_mvc || process_3d_type) {
if (vf->canvas1Addr != (u32)-1) {
canvas_copy(vf->canvas1Addr & 0xff,
disp_canvas_index[rdma_canvas_id][3]);
@@ -3778,18 +3778,22 @@ static void vsync_toggle_frame(struct vframe_s *vf)
disp_canvas[rdma_canvas_id][0]);
}
if (cur_frame_par
&& (process_3d_type & MODE_3D_ENABLE)
&& (process_3d_type & MODE_3D_TO_2D_R)
&& (cur_frame_par->vpp_2pic_mode == VPP_SELECT_PIC1)
&& is_mvc) {
&& (process_3d_type & MODE_3D_ENABLE)
&& (process_3d_type & MODE_3D_TO_2D_R)
&& (cur_frame_par->vpp_2pic_mode
== VPP_SELECT_PIC1)) {
VSYNC_WR_MPEG_REG(VD1_IF0_CANVAS0 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
disp_canvas[rdma_canvas_id][1]);
VSYNC_WR_MPEG_REG(VD1_IF0_CANVAS1 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
VSYNC_WR_MPEG_REG(VD2_IF0_CANVAS0 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
VSYNC_WR_MPEG_REG(VD2_IF0_CANVAS1 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
disp_canvas[rdma_canvas_id][1]);
if (is_mvc) {
VSYNC_WR_MPEG_REG(
VD2_IF0_CANVAS0 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
VSYNC_WR_MPEG_REG(
VD2_IF0_CANVAS1 + cur_dev->viu_off,
disp_canvas[rdma_canvas_id][1]);
}
}
next_rdma_canvas_id = rdma_canvas_id ? 0 : 1;
#else
@@ -3798,7 +3802,7 @@ static void vsync_toggle_frame(struct vframe_s *vf)
disp_canvas_index[1]);
canvas_copy((vf->canvas0Addr >> 16) & 0xff,
disp_canvas_index[2]);
if (is_mvc) {
if (is_mvc || process_3d_type) {
canvas_copy(vf->canvas1Addr & 0xff,
disp_canvas_index[3]);
canvas_copy((vf->canvas1Addr >> 8) & 0xff,