From 559b030bcb730f9490def9c0ebb83f2ed040c324 Mon Sep 17 00:00:00 2001
From: Johnson Ding <johnson.ding@rock-chips.com>
Date: Fri, 4 Jun 2021 16:03:36 +0800
Subject: [PATCH] [jpegd]: Fix timeout problem

When decoding a YUV444 picture with format convertion, it may encounter
timeout error.

Change-Id: I9a9f6eda6c9ee92e029530c0dbbb8ad7f48d9d18
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
---
 mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c
index 1f3252c9..6a97af6f 100644
--- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c
@@ -711,6 +711,7 @@ MPP_RET jpegd_gen_regs(JpegdHalCtx *ctx, JpegdSyntax *syntax)
      * but not 16-pixel aligned
      */
     if ((s->height % 16) && ((s->height % 16) <= 8) &&
+        (!ctx->pp_info.pp_enable) &&
         (s->yuv_mode == JPEGDEC_YUV422 ||
          s->yuv_mode == JPEGDEC_YUV444 ||
          s->yuv_mode == JPEGDEC_YUV411)) {