From 06924716e611a0e84ef31eb80cfe534ec3a57722 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Wed, 25 Apr 2018 16:05:16 +0800 Subject: [PATCH] vdec: enable s805x flag PD#163927: 1) enable s805x flag in vdec 2) fix h265 overszie handle issue on s805 Change-Id: I7b2610fe4e4d4e08e752de82eac8ab8e71f7b837 Signed-off-by: Hui Zhang --- .../media_modules/frame_provider/decoder/h265/vh265.c | 10 ++++------ .../media_modules/frame_provider/decoder/utils/vdec.c | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c b/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c index d42a2ab765cd..73f56dd6bf0a 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c @@ -8138,14 +8138,12 @@ pic_done: } else if (dec_status == HEVC_DECODE_OVER_SIZE) { hevc_print(hevc, 0 , "hevc decode oversize !!\n"); - debug |= (H265_DEBUG_DIS_LOC_ERROR_PROC | - H265_DEBUG_DIS_SYS_ERROR_PROC); - hevc->fatal_error |= DECODER_FATAL_ERROR_SIZE_OVERFLOW; #ifdef MULTI_INSTANCE_SUPPORT - if (hevc->m_ins_flag) - reset_process_time(hevc); + if (!hevc->m_ins_flag) + debug |= (H265_DEBUG_DIS_LOC_ERROR_PROC | + H265_DEBUG_DIS_SYS_ERROR_PROC); #endif - return IRQ_HANDLED; + hevc->fatal_error |= DECODER_FATAL_ERROR_SIZE_OVERFLOW; } return IRQ_HANDLED; } diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c b/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c index 261686038264..d4689c156d1a 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c @@ -298,8 +298,7 @@ void vdec_count_info(struct vdec_info *vs, unsigned int err, EXPORT_SYMBOL(vdec_count_info); int vdec_is_support_4k(void) { - //return !is_meson_gxl_package_805X(); - return 1; + return !is_meson_gxl_package_805X(); } EXPORT_SYMBOL(vdec_is_support_4k);