From 6536f5462eac83ba2690db90990f5c665d38545f Mon Sep 17 00:00:00 2001 From: "alex.cao" Date: Thu, 11 Dec 2014 09:38:28 +0000 Subject: [PATCH] pd #100847:Change mx4.4 vpp_process_speed_check the same as mx4.2 Change-Id: Ibe3baefb5cd6bb962201765b4e6d48da58550af0 --- drivers/amlogic/amports/vpp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/amports/vpp.c b/drivers/amlogic/amports/vpp.c index ad9e35fc17cc..98eaf9304417 100755 --- a/drivers/amlogic/amports/vpp.c +++ b/drivers/amlogic/amports/vpp.c @@ -335,10 +335,15 @@ vpp_process_speed_check(s32 width_in, return SPEED_CHECK_DONE; } - /* if (video_speed_check_width * video_speed_check_height * height_out > height_screen * width_in * height_in) { */ - if (height_out > height_in) { +#if (MESON_CPU_TYPE > MESON_CPU_TYPE_MESON6) + if ((height_out+1) > height_in) { return SPEED_CHECK_DONE; } +#else + if (video_speed_check_width * video_speed_check_height * height_out > height_screen * width_in * height_in) { + return SPEED_CHECK_DONE; + } +#endif amlog_mask(LOG_MASK_VPP, "vpp_process_speed_check failed\n");