osd: fix display frame offset caused osd display abnormal [1/1]
authorPengcheng Chen <pengcheng.chen@amlogic.com>
Wed, 23 Jan 2019 09:22:39 +0000 (17:22 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Fri, 25 Jan 2019 02:50:34 +0000 (18:50 -0800)
PD#OTT-1663

Problem:
display frame offset caused osd display abnormal

Solution:
remove unnecessary blend dst_data adjust

Verify:
Locally on raven

Change-Id: I38b97f6da750f5edea97416b4d7fc0172dea7466
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
drivers/amlogic/media/osd/osd_hw.c

index 4640eab..71a3dc9 100644 (file)
@@ -7526,17 +7526,6 @@ static void uniformization_fb(u32 index,
                blending->screen_ratio_w;
        blending->dst_data.h = (osd_hw.dst_data[index].h << OSD_CALC) /
                blending->screen_ratio_h;
-       if (osd_hw.dst_data[index].w < osd_hw.disp_info.position_w)
-               osd_log_err("base dispframe w(%d) must >= position_w(%d)\n",
-               osd_hw.dst_data[index].w, osd_hw.disp_info.position_w);
-       if ((blending->dst_data.w + blending->dst_data.x) >
-               osd_hw.disp_info.background_w) {
-               blending->dst_data.w = osd_hw.disp_info.background_w
-                       - blending->dst_data.x;
-               osd_log_info("blending w(%d) must < base fb w(%d)\n",
-                       blending->dst_data.w + blending->dst_data.x,
-                       osd_hw.disp_info.background_w);
-       }
        osd_log_dbg2(MODULE_BLEND,
                "uniformization:osd%d:dst_data:%d,%d,%d,%d\n",
                index,