MLK-20014: ISI: initialize SCL_IMG_CFG to source image width and height
authorGuoniu.Zhou <guoniu.zhou@nxp.com>
Mon, 22 Oct 2018 08:49:39 +0000 (16:49 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
Initialize SCL_IMG_CFG to source image width and height when
scale disabled

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit 506b32bb9ad6a3f596510e401b0e8fa16ca8b659)

drivers/media/platform/imx8/mxc-isi-hw.c

index b13777b..6e686bd 100644 (file)
@@ -691,6 +691,10 @@ void mxc_isi_m2m_channel_config(struct mxc_isi_dev *mxc_isi)
                        mxc_isi->m2m.alphaen << CHNL_IMG_CTRL_GBL_ALPHA_EN_OFFSET);
        writel(reg, mxc_isi->regs + CHNL_IMG_CTRL);
 
+       /* scale size need to equal input size when scaling disabled*/
+       reg = src_f->o_width | (src_f->o_height << CHNL_IMG_CFG_HEIGHT_OFFSET);
+       writel(reg, mxc_isi->regs + CHNL_SCL_IMG_CFG);
+
        /* CSC */
        mxc_isi_channel_set_csc(mxc_isi);