From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55156C38145 for ; Thu, 8 Sep 2022 03:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229723AbiIHDto (ORCPT ); Wed, 7 Sep 2022 23:49:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbiIHDtl (ORCPT ); Wed, 7 Sep 2022 23:49:41 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8380A13F83 for ; Wed, 7 Sep 2022 20:49:40 -0700 (PDT) Received: from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp [175.177.42.159]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DBCED6CC; Thu, 8 Sep 2022 05:49:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1662608978; bh=oBSKkY3rnyHEgvSMjsT6f+Fp41r3MaI3vUQY5fUHGFU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dQdnLpZ2FkkO6jX11+mmW6GHoHKaqfSTOXHP3A7TEoBIaeydayEUYnCTkpfVNK81C CbLKJUgBTYaaDTXUR5ppPF4xOW07h0mgx4B+1z4Jj4ubelMm9EVnM4OGaS7QfpqRYW LduO5ZbznGAEr139/+2GaR1yPTGRUXmyvYAz5TwQ= Date: Thu, 8 Sep 2022 12:49:30 +0900 From: paul.elder@ideasonboard.com To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Rui Miguel Silva , Steve Longerbeam , Philipp Zabel , Jacopo Mondi , kernel@pengutronix.de, linux-imx@nxp.com Subject: Re: [PATCH 3/3] media: imx: imx7-media-csi: Clear BIT_MIPI_DOUBLE_CMPNT for <16b formats Message-ID: <20220908034930.GD1140330@pyrite.rasen.tech> References: <20220907191547.19255-1-laurent.pinchart@ideasonboard.com> <20220907191547.19255-4-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220907191547.19255-4-laurent.pinchart@ideasonboard.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Wed, Sep 07, 2022 at 10:15:47PM +0300, Laurent Pinchart wrote: > Commit 9babbbaaeb87 ("media: imx: imx7-media-csi: Use dual sampling for > YUV 1X16") set BIT_MIPI_DOUBLE_CMPNT in the CR18 register for 16-bit YUV > formats in imx7_csi_configure(). The CR18 register is always updated > with read-modify-write cycles, so if a 16-bit YUV format is selected, > the bit will stay set forever, even if the format is changed. Fix it by > clearing the bit at the beginning of the imx7_csi_configure() function. > > While at it, swap two of the bits being cleared to match the MSB to LSB > order. This doesn't cause any functional change. > > Fixes: 9babbbaaeb87 ("media: imx: imx7-media-csi: Use dual sampling for YUV 1X16") > Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder > --- > drivers/staging/media/imx/imx7-media-csi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c > index 03986445c0da..21d6e56ffcd4 100644 > --- a/drivers/staging/media/imx/imx7-media-csi.c > +++ b/drivers/staging/media/imx/imx7-media-csi.c > @@ -522,9 +522,9 @@ static void imx7_csi_configure(struct imx7_csi *csi) > cr18 = imx7_csi_reg_read(csi, CSI_CSICR18); > > cr18 &= ~(BIT_CSI_HW_ENABLE | BIT_MIPI_DATA_FORMAT_MASK | > - BIT_DATA_FROM_MIPI | BIT_BASEADDR_CHG_ERR_EN | > - BIT_BASEADDR_SWITCH_EN | BIT_BASEADDR_SWITCH_SEL | > - BIT_DEINTERLACE_EN); > + BIT_DATA_FROM_MIPI | BIT_MIPI_DOUBLE_CMPNT | > + BIT_BASEADDR_CHG_ERR_EN | BIT_BASEADDR_SWITCH_SEL | > + BIT_BASEADDR_SWITCH_EN | BIT_DEINTERLACE_EN); > > if (out_pix->field == V4L2_FIELD_INTERLACED) { > cr18 |= BIT_DEINTERLACE_EN;