media: imx-jpeg: Encoder add support for 12bit jpeg

enable encoding 12-bit extended jpeg

Signed-off-by: Ming Qian <ming.qian@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
index bbd5d6a..9a6e8b3 100644 (file)
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
@@ -97,25 +97,31 @@ void mxc_jpeg_sw_reset(void __iomem *reg)
        writel(GLB_CTRL_SFT_RST, reg + GLB_CTRL);
 }
 
-void mxc_jpeg_enc_mode_conf(struct device *dev, void __iomem *reg)
+void mxc_jpeg_enc_mode_conf(struct device *dev, void __iomem *reg, u8 extseq)
 {
        dev_dbg(dev, "CAST Encoder CONFIG...\n");
        /*
         * "Config_Mode" enabled, "Config_Mode auto clear enabled",
         */
-       writel(0xa0, reg + CAST_MODE);
+       if (extseq)
+               writel(0xb0, reg + CAST_MODE);
+       else
+               writel(0xa0, reg + CAST_MODE);
 
        /* all markers and segments */
        writel(0x3ff, reg + CAST_CFG_MODE);
 }
 
-void mxc_jpeg_enc_mode_go(struct device *dev, void __iomem *reg)
+void mxc_jpeg_enc_mode_go(struct device *dev, void __iomem *reg, u8 extseq)
 {
        dev_dbg(dev, "CAST Encoder GO...\n");
        /*
         * "GO" enabled, "GO bit auto clear" enabled
         */
-       writel(0x140, reg + CAST_MODE);
+       if (extseq)
+               writel(0x150, reg + CAST_MODE);
+       else
+               writel(0x140, reg + CAST_MODE);
 }
 
 void mxc_jpeg_enc_set_quality(struct device *dev, void __iomem *reg, u8 quality)

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
index 8b7cd65..ed15ea3 100644 (file)
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
@@ -117,8 +117,8 @@ void print_wrapper_info(struct device *dev, void __iomem *reg);
 void mxc_jpeg_sw_reset(void __iomem *reg);
 int mxc_jpeg_enable(void __iomem *reg);
 void wait_frmdone(struct device *dev, void __iomem *reg);
-void mxc_jpeg_enc_mode_conf(struct device *dev, void __iomem *reg);
-void mxc_jpeg_enc_mode_go(struct device *dev, void __iomem *reg);
+void mxc_jpeg_enc_mode_conf(struct device *dev, void __iomem *reg, u8 extseq);
+void mxc_jpeg_enc_mode_go(struct device *dev, void __iomem *reg, u8 extseq);
 void mxc_jpeg_enc_set_quality(struct device *dev, void __iomem *reg, u8 quality);
 void mxc_jpeg_dec_mode_go(struct device *dev, void __iomem *reg);
 int mxc_jpeg_get_slot(void __iomem *reg);

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 9a2d44f..c0e49be 100644 (file)
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -322,6 +322,45 @@ static const unsigned char jpeg_dqt[] = {
        0x63, 0x63, 0x63, 0x63, 0x63, 0x63
 };
 
+static const unsigned char jpeg_dqt_extseq[] = {
+       0xFF, 0xDB,
+       0x01, 0x04,
+       0x10,
+       0x00, 0x80, 0x00, 0x58, 0x00, 0x60, 0x00, 0x70,
+       0x00, 0x60, 0x00, 0x50, 0x00, 0x80, 0x00, 0x70,
+       0x00, 0x68, 0x00, 0x70, 0x00, 0x90, 0x00, 0x88,
+       0x00, 0x80, 0x00, 0x98, 0x00, 0xC0, 0x01, 0x40,
+       0x00, 0xD0, 0x00, 0xC0, 0x00, 0xB0, 0x00, 0xB0,
+       0x00, 0xC0, 0x01, 0x88, 0x01, 0x18, 0x01, 0x28,
+       0x00, 0xE8, 0x01, 0x40, 0x01, 0xD0, 0x01, 0x98,
+       0x01, 0xE8, 0x01, 0xE0, 0x01, 0xC8, 0x01, 0x98,
+       0x01, 0xC0, 0x01, 0xB8, 0x02, 0x00, 0x02, 0x40,
+       0x02, 0xE0, 0x02, 0x70, 0x02, 0x00, 0x02, 0x20,
+       0x02, 0xB8, 0x02, 0x28, 0x01, 0xB8, 0x01, 0xC0,
+       0x02, 0x80, 0x03, 0x68, 0x02, 0x88, 0x02, 0xB8,
+       0x02, 0xF8, 0x03, 0x10, 0x03, 0x38, 0x03, 0x40,
+       0x03, 0x38, 0x01, 0xF0, 0x02, 0x68, 0x03, 0x88,
+       0x03, 0xC8, 0x03, 0x80, 0x03, 0x20, 0x03, 0xC0,
+       0x02, 0xE0, 0x03, 0x28, 0x03, 0x38, 0x03, 0x18,
+       0x11,
+       0x00, 0x88, 0x00, 0x90, 0x00, 0x90, 0x00, 0xC0,
+       0x00, 0xA8, 0x00, 0xC0, 0x01, 0x78, 0x00, 0xD0,
+       0x00, 0xD0, 0x01, 0x78, 0x03, 0x18, 0x02, 0x10,
+       0x01, 0xC0, 0x02, 0x10, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+       0x03, 0x18, 0x03, 0x18, 0x03, 0x18, 0x03, 0x18,
+};
+
 static const unsigned char jpeg_sof_maximal[] = {
        0xFF, 0xC0,
        0x00, 0x14, 0x08, 0x00, 0x40, 0x00, 0x40,
@@ -329,6 +368,13 @@ static const unsigned char jpeg_sof_maximal[] = {
        0x03, 0x11, 0x01, 0x04, 0x11, 0x01
 };
 
+static const unsigned char jpeg_sof_extseq[] = {
+       0xFF, 0xC1,
+       0x00, 0x14, 0x08, 0x00, 0x40, 0x00, 0x40,
+       0x04, 0x01, 0x11, 0x00, 0x02, 0x11, 0x01,
+       0x03, 0x11, 0x01, 0x04, 0x11, 0x01
+};
+
 static const unsigned char jpeg_dht[] = {
        0xFF, 0xC4,
        0x01, 0xA2, 0x00, 0x00, 0x01, 0x05, 0x01,
@@ -393,6 +439,90 @@ static const unsigned char jpeg_dht[] = {
        0xF6, 0xF7, 0xF8, 0xF9, 0xFA
 };
 
+static const unsigned char jpeg_dht_extseq[] = {
+       0xFF, 0xC4,
+       0x02, 0x2a, 0x00, 0x00, 0x01, 0x05, 0x01,
+       0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
+       0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+       0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+       0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,
+       0x04, 0x03, 0x05, 0x05, 0x02, 0x03, 0x02,
+       0x00, 0x00, 0xbf, 0x01, 0x02, 0x03, 0x00,
+       0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41,
+       0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71,
+       0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 0x23,
+       0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+       0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a,
+       0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26,
+       0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36,
+       0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
+       0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54,
+       0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63,
+       0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,
+       0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+       0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
+       0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+       0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4,
+       0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2,
+       0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
+       0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+       0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5,
+       0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+       0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+       0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6,
+       0xf7, 0xf8, 0xf9, 0xfa, 0x0b, 0x0c, 0x0d,
+       0x0e, 0x1b, 0x1c, 0x1d, 0x1e, 0x2b, 0x2c,
+       0x2d, 0x2e, 0x3b, 0x3c, 0x3d, 0x3e, 0x4b,
+       0x4c, 0x4d, 0x4e, 0x5b, 0x5c, 0x5d, 0x5e,
+       0x6b, 0x6c, 0x6d, 0x6e, 0x7b, 0x7c, 0x7d,
+       0x7e, 0x8b, 0x8c, 0x8d, 0x8e, 0x9b, 0x9c,
+       0x9d, 0x9e, 0xab, 0xac, 0xad, 0xae, 0xbb,
+       0xbc, 0xbd, 0xbe, 0xcb, 0xcc, 0xcd, 0xce,
+       0xdb, 0xdc, 0xdd, 0xde, 0xeb, 0xec, 0xed,
+       0xee, 0xfb, 0xfc, 0xfd, 0xfe, 0x01, 0x00,
+       0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+       0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+       0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
+       0x0d, 0x0e, 0x0f, 0x11, 0x00, 0x02, 0x01,
+       0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05,
+       0x02, 0x03, 0x02, 0x00, 0x00, 0xbf, 0x01,
+       0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+       0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,
+       0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91,
+       0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15,
+       0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72,
+       0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19,
+       0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
+       0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a,
+       0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+       0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+       0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67,
+       0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76,
+       0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85,
+       0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93,
+       0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
+       0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,
+       0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+       0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4,
+       0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+       0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
+       0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
+       0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3,
+       0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa,
+       0x0b, 0x0c, 0x0d, 0x0e, 0x1b, 0x1c, 0x1d,
+       0x1e, 0x2b, 0x2c, 0x2d, 0x2e, 0x3b, 0x3c,
+       0x3d, 0x3e, 0x4b, 0x4c, 0x4d, 0x4e, 0x5b,
+       0x5c, 0x5d, 0x5e, 0x6b, 0x6c, 0x6d, 0x6e,
+       0x7b, 0x7c, 0x7d, 0x7e, 0x8b, 0x8c, 0x8d,
+       0x8e, 0x9b, 0x9c, 0x9d, 0x9e, 0xab, 0xac,
+       0xad, 0xae, 0xbb, 0xbc, 0xbd, 0xbe, 0xcb,
+       0xcc, 0xcd, 0xce, 0xdb, 0xdc, 0xdd, 0xde,
+       0xeb, 0xec, 0xed, 0xee, 0xfb, 0xfc, 0xfd,
+       0xfe,
+};
+
 static const unsigned char jpeg_dri[] = {
        0xFF, 0xDD,
        0x00, 0x04, 0x00, 0x20
@@ -806,7 +936,8 @@ static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv)
        if (dec_ret & SLOT_STATUS_ENC_CONFIG_ERR) {
                u32 ret = readl(reg + CAST_STATUS12);
 
-               dev_err(dev, "Encoder/decoder error, status=0x%08x", ret);
+               dev_err(dev, "Encoder/decoder error, dec_ret = 0x%08x, status=0x%08x",
+                       dec_ret, ret);
                mxc_jpeg_clr_desc(reg, slot);
                mxc_jpeg_sw_reset(reg);
                buf_state = VB2_BUF_STATE_ERROR;
@@ -818,10 +949,11 @@ static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv)
 
        if (jpeg->mode == MXC_JPEG_ENCODE &&
            ctx->enc_state == MXC_JPEG_ENC_CONF) {
+               q_data = mxc_jpeg_get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
                ctx->enc_state = MXC_JPEG_ENCODING;
                dev_dbg(dev, "Encoder config finished. Start encoding...\n");
                mxc_jpeg_enc_set_quality(dev, reg, ctx->jpeg_quality);
-               mxc_jpeg_enc_mode_go(dev, reg);
+               mxc_jpeg_enc_mode_go(dev, reg, mxc_jpeg_is_extended_sequential(q_data->fmt));
                goto job_unlock;
        }
        if (jpeg->mode == MXC_JPEG_DECODE && jpeg_src_buf->dht_needed) {
@@ -872,8 +1004,12 @@ static int mxc_jpeg_fixup_sof(struct mxc_jpeg_sof *sof,
                              u16 w, u16 h)
 {
        int sof_length;
+       const struct mxc_jpeg_fmt *fmt = mxc_jpeg_find_format(fourcc);
 
-       sof->precision = 8; /* TODO allow 8/12 bit precision*/
+       if (fmt)
+               sof->precision = fmt->precision;
+       else
+               sof->precision = 8; /* TODO allow 8/12 bit precision*/
        sof->height = h;
        _bswap16(&sof->height);
        sof->width = w;
@@ -992,16 +1128,28 @@ static unsigned int mxc_jpeg_setup_cfg_stream(void *cfg_stream_vaddr,
                offset += sizeof(jpeg_app0);
        }
 
-       memcpy(cfg + offset, jpeg_dqt, sizeof(jpeg_dqt));
-       offset += sizeof(jpeg_dqt);
+       if (mxc_jpeg_is_extended_sequential(fmt)) {
+               memcpy(cfg + offset, jpeg_dqt_extseq, sizeof(jpeg_dqt_extseq));
+               offset += sizeof(jpeg_dqt_extseq);
+
+               memcpy(cfg + offset, jpeg_sof_extseq, sizeof(jpeg_sof_extseq));
+       } else {
+               memcpy(cfg + offset, jpeg_dqt, sizeof(jpeg_dqt));
+               offset += sizeof(jpeg_dqt);
 
-       memcpy(cfg + offset, jpeg_sof_maximal, sizeof(jpeg_sof_maximal));
+               memcpy(cfg + offset, jpeg_sof_maximal, sizeof(jpeg_sof_maximal));
+       }
        offset += 2; /* skip marker ID */
        sof = (struct mxc_jpeg_sof *)(cfg + offset);
        offset += mxc_jpeg_fixup_sof(sof, fourcc, w, h);
 
-       memcpy(cfg + offset, jpeg_dht, sizeof(jpeg_dht));
-       offset += sizeof(jpeg_dht);
+       if (mxc_jpeg_is_extended_sequential(fmt)) {
+               memcpy(cfg + offset, jpeg_dht_extseq, sizeof(jpeg_dht_extseq));
+               offset += sizeof(jpeg_dht_extseq);
+       } else {
+               memcpy(cfg + offset, jpeg_dht, sizeof(jpeg_dht));
+               offset += sizeof(jpeg_dht);
+       }
 
        memcpy(cfg + offset, jpeg_dri, sizeof(jpeg_dri));
        offset += sizeof(jpeg_dri);
@@ -1142,6 +1290,10 @@ static void mxc_jpeg_config_enc_desc(struct vb2_buffer *out_buf,
        desc->stm_ctrl = STM_CTRL_CONFIG_MOD(0) |
                         STM_CTRL_IMAGE_FORMAT(img_fmt);
        desc->stm_ctrl |= STM_CTRL_BITBUF_PTR_CLR(1);
+       if (mxc_jpeg_is_extended_sequential(q_data->fmt))
+               desc->stm_ctrl |= STM_CTRL_PIXEL_PRECISION;
+       else
+               desc->stm_ctrl &= ~STM_CTRL_PIXEL_PRECISION;
        mxc_jpeg_addrs(desc, src_buf, dst_buf, 0);
        dev_dbg(jpeg->dev, "cfg_desc:\n");
        print_descriptor_info(jpeg->dev, cfg_desc);
@@ -1342,7 +1494,9 @@ static void mxc_jpeg_device_run(void *priv)
                ctx->enc_state = MXC_JPEG_ENC_CONF;
                mxc_jpeg_config_enc_desc(&dst_buf->vb2_buf, ctx,
                                         &src_buf->vb2_buf, &dst_buf->vb2_buf);
-               mxc_jpeg_enc_mode_conf(dev, reg); /* start config phase */
+               /* start config phase */
+               mxc_jpeg_enc_mode_conf(dev, reg,
+                                      mxc_jpeg_is_extended_sequential(q_data_out->fmt));
        } else {
                dev_dbg(dev, "Decoding on slot %d\n", ctx->slot);
                print_mxc_buf(jpeg, &src_buf->vb2_buf, 0);