Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mirela Rabulea <mirela.rabulea@nxp.com>
To:     mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
        robert.chiras@nxp.com, laurentiu.palcu@nxp.com
Cc:     linux-imx@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com,
        linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] media: imx-jpeg: Fix occasional decoder fail on jpegs without DHT
Date:   Mon, 27 Sep 2021 21:56:57 +0300
Message-Id: <20210927185657.3094734-1-mirela.rabulea@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+3+bSM0GpFXiJATHm59V9uLrmqI4BTOCyCbHFWliq13yH3oO3N+6InOAly9g?=
 =?us-ascii?Q?8X7VX44RRuNwfF9SnU0Tpd1yhmYlmVuSnZIv6BDNSUP91uRSJ4JexyJwr5Ve?=
 =?us-ascii?Q?f42PTU+cM16IOaJdeZoXwxEgRLwIvxfjQtSFwfZkP6rVm0ZSd1q7oHFM0cmY?=
 =?us-ascii?Q?JGuRaRYD84yMso58O4lxxeU/i22gRwKPRNmvpVRUnX+y+Nepfr0iO1/RUKyM?=
 =?us-ascii?Q?w0UsuIzkFD/fGAWZelJi1luSCOrtwk8fmHwaBwA6+ItZtCdwjt9aGtJ4EcNE?=
 =?us-ascii?Q?AlE8SGa+lSvqQ1BqDduXGQLmIdBc8HiZPeakw9iPLfQJdQi4Z2x9F0ap28Yl?=
 =?us-ascii?Q?Vgf5kiYD8WIytq4dDrNHpALvrIVriUMg10R6FUs0pXWdCwDVWtbbn6QVnMD8?=
 =?us-ascii?Q?lyqFTYBBuxHJYXJ0+zY5cLOZnRBae5r28Gf3JrYZ/mqSUpeLFTSMPEApRG8x?=
 =?us-ascii?Q?oRsYJYCWhZ0xfprPL2VJqw5Oh8y0nK91r2Y6+FXljTxCem4GZsplwaW2ECuY?=
 =?us-ascii?Q?Dk2w8jbTgBeGs3D1kVE8lX6uNxBtAd5Sp2fER0Mc0A4+Kat3BCydu0XT121d?=
 =?us-ascii?Q?oF6qdDHR+XzBp2Vg/30jjjCfvmCoouYNO4gN6x4hjdvBc9cUe7hZf/OEhluz?=
 =?us-ascii?Q?5Ac9T0z3jLO83es6YX5tbVGvbLVIi+zWfNsabEtf6HDECOVFYjV+Nvw0lp1j?=
 =?us-ascii?Q?0smhNoV4EZspTxMZzUapcaFauGV/9OBoPPYWRRVGdzHdxhk9mP70BAk2E7uU?=
 =?us-ascii?Q?HHSRvBxFj/ZIUK6bfnAWOUlz+KCpJVm12a+PYqCzQF9DQXD8KMdwUeam9DFm?=
 =?us-ascii?Q?8qc+MhkU5T56J7Cm7ayGhQBNkJaA8eBpU1FWCkBj9uKOssm6XPXGmlmAYbvL?=
 =?us-ascii?Q?k5cdJl3ymLst/4cBev+yYkaz3HK/LHdFSxzEmBLLO0Ecfs6MBhPnNhq56tZH?=
 =?us-ascii?Q?22RX8gwphnhtfXEYEZi93Ky9C4uIGLuiAhPGZwWBke3jcX0l1daUWf8jd+RA?=
 =?us-ascii?Q?3YDNY542gTHaU6kzJ31c5C0Tq1Q2Ql8z8XffdIv8nlYpaiqDp7kzpymsroHT?=
 =?us-ascii?Q?/m4bacvWS78hbPFhtHzU3E/gV24aSJSMyyxEWdyeRw2cKw1xNTXvP4Pjc/tb?=
 =?us-ascii?Q?ItlKnzMLRCgZbJWbWEqUeAa3nyHChDHxPRm3gybppmo+NINLJqTf0bg6oV+9?=
 =?us-ascii?Q?GkAkkoARmGPVaFy6buOI+6pPUoznAyAGVyi+nf82dysV8szCzj0hnzERLMUY?=
 =?us-ascii?Q?Hr0kYsshWDAHx8q3w4OGFN+q045bA3Ff1CNxllpXz0EBcdwDnRvymX6Aeu7w?=
 =?us-ascii?Q?QX0X2B7wraFJNzxokhmqkreG?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2faafad9-f4a6-4986-eed3-08d981e89b2a
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0401MB2495.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 18:57:08.8642
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: K6qnUu/jTzVGDt+NOjy7IfoR5HWynM+uSxUZEEhsQcWUkOHNkpeTqoMKkQevxEs2vTbkODGe2iJqMRiIGwGFTw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2287
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add some body to the dummy jpeg used to inject a default DHT.
Use jpeg_image_red as compressed image data, insert it at the
end of SOS, before EOI.

The pure dummy jpeg was occasionally not working well on
8qxp C0.

Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
---
 drivers/media/platform/imx-jpeg/mxc-jpeg.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index b1678f94dccd..bd19a4b1bf08 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -283,6 +283,20 @@ static const unsigned char jpeg_sos_maximal[] = {
 	0x11, 0x04, 0x11, 0x00, 0x3F, 0x00
 };
 
+static const unsigned char jpeg_image_red[] = {
+	0xFC, 0x5F, 0xA2, 0xBF, 0xCA, 0x73, 0xFE, 0xFE,
+	0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00,
+	0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02,
+	0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28,
+	0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A,
+	0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0,
+	0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00,
+	0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02,
+	0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28,
+	0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A,
+	0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00
+};
+
 static const unsigned char jpeg_eoi[] = {
 	0xFF, 0xD9
 };
@@ -765,6 +779,9 @@ static unsigned int mxc_jpeg_setup_cfg_stream(void *cfg_stream_vaddr,
 	sos = (struct mxc_jpeg_sos *)(cfg + offset);
 	offset += mxc_jpeg_fixup_sos(sos, fourcc);
 
+	memcpy(cfg + offset, jpeg_image_red, sizeof(jpeg_image_red));
+	offset += sizeof(jpeg_image_red);
+
 	memcpy(cfg + offset, jpeg_eoi, sizeof(jpeg_eoi));
 	offset += sizeof(jpeg_eoi);
 
-- 
2.25.1