Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp155737ybh;
        Tue, 14 Jul 2020 21:22:04 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJyGsgIzSq4ZXSdRppaaLCulHvaBr+SkzMh5bw4yf74vX6cg1H5YD4w23aLGeO1JbX47oOYz
X-Received: by 2002:a17:907:1114:: with SMTP id qu20mr7769313ejb.41.1594786923866;
        Tue, 14 Jul 2020 21:22:03 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1594786923; cv=none;
        d=google.com; s=arc-20160816;
        b=xNRWXryTAyoM6RMdeK6JUKwfS+84F06Y4FW1Qdsd+0MbznNiohISimqW0OHXVyJmUU
         cDQYDpNpIi1yr2l2v/Of/ds5nLfENpumla0tW+cI5s+OuT2fx9AmlxxrjO1EEk+nSb6U
         OfVajYrGbK92BFLoQNFn/esTS2R1RCv4PkDZcw1akQKixgg/t9Ik9PWFW5x4wpn8pAbx
         aN+aTYmAoKP7H+7FCzg4eqnqfxX5XnJyw5u7WNefiVUQDjnhLwEvLLEuC+9g8Fz1keO1
         ZZ7qltfB/tS24uqcVhpM71ax0flBRZMtY01EUV3UUm8HsoznDdoAw6c/btXmD0Fjhl+M
         vO4A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:dkim-signature:mime-version:references
         :in-reply-to:message-id:date:subject:cc:to:from;
        bh=RezmIyFFbXHYoC7uY1I5ZqbxI3VHo5hil8M0f4GeUvI=;
        b=klyqw5fpKy5MjCk9X7Su17TeS7C13OGjvuSWXRQGn+4TT4RmGtBdMf2jLrS/aWP9Pj
         lpvaDnUpOYQghnPyPuiddIwgZMptgNcU3cEtkFXUAjpc551NMdF1U6WMNaNgb3U2gocd
         BDCTEd4CFpp01wvH5itpyBA1Cm8F1eXqlFMQvF/moVprEPn6ac7SrAKgqLweePIHSinx
         ATFOKy3Cfb3OoWzxyWxNNMgsH8TfeuuA9kfRzUhuzTWdkgZUxjUpDdB8je9y7lRDSxmI
         /b7Y2F+n5/X6Ue6hTWf79dtOVHb7XXCy9oW8GjoJYS+AKYrLzmkuEOwZXyGEO38xYZbP
         T7xg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b="H2PeL/HY";
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id w5si560962edx.179.2020.07.14.21.21.41;
        Tue, 14 Jul 2020 21:22:03 -0700 (PDT)
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;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b="H2PeL/HY";
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728358AbgGOETg (ORCPT <rfc822;1990.zhangzhen@gmail.com>
        + 99 others); Wed, 15 Jul 2020 00:19:36 -0400
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:4615 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728250AbgGOETb (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 15 Jul 2020 00:19:31 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5f0e83c70000>; Tue, 14 Jul 2020 21:19:19 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Tue, 14 Jul 2020 21:19:31 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Tue, 14 Jul 2020 21:19:31 -0700
Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL101.nvidia.com
 (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 15 Jul
 2020 04:19:31 +0000
Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL111.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Wed, 15 Jul 2020 04:19:30 +0000
Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.160.169]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5f0e83d10003>; Tue, 14 Jul 2020 21:19:30 -0700
From:   Sowjanya Komatineni <skomatineni@nvidia.com>
To:     <skomatineni@nvidia.com>, <thierry.reding@gmail.com>,
        <jonathanh@nvidia.com>, <frankc@nvidia.com>, <hverkuil@xs4all.nl>,
        <sakari.ailus@iki.fi>, <robh+dt@kernel.org>,
        <helen.koike@collabora.com>
CC:     <digetx@gmail.com>, <sboyd@kernel.org>,
        <gregkh@linuxfoundation.org>, <linux-media@vger.kernel.org>,
        <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <linux-i2c@vger.kernel.org>
Subject: [RFC PATCH v3 08/18] media: tegra-video: Fix channel format alignment
Date:   Tue, 14 Jul 2020 21:20:45 -0700
Message-ID: <1594786855-26506-9-git-send-email-skomatineni@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com>
References: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com>
X-NVConfidentiality: public
MIME-Version: 1.0
Content-Type: text/plain
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1594786759; bh=RezmIyFFbXHYoC7uY1I5ZqbxI3VHo5hil8M0f4GeUvI=;
        h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
         In-Reply-To:References:X-NVConfidentiality:MIME-Version:
         Content-Type;
        b=H2PeL/HYEyfKxkIYmT2Z+7rAiSeiBrNlkL8X7wqliMj8OEEz6Em7jYMDJ0MeUvSVk
         kuWN6ZpkKVLu5gG1aTfABMmio53yhtPx2cvxCGGTNuf/OU7mkkjX9J6gd1Xk+LzSii
         SC+sIsf7NAn0WmJRLH9J24YABvYGdv3SFxRQYFYeU7qyVYGmwE9TkZVDK1q40E7StD
         pV/JTfqqOOVCgmCOkydLr66eNDPqmKl3DmNyaeG69gzaMvD7g2/s7piQJsXGHYlkYc
         oJyhwmLRMOBf0+bsWgNcAVzrAh0maS2xHp/TWUSerzsu+KO6HMNxv1FgHC0iccO3ZN
         wLYedOEbkAlPw==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Pixel format width is mistakenly aligned to surface align bytes
and altering width to aligned value may force sensor mode change
other than the requested one and also cause mismatch in width
programmed between sensor and vi which can lead to capture errors.

This patch removes width alignment and clamps width as per Tegra
minimum and maximum limits.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
 drivers/staging/media/tegra-video/vi.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index a3b9b21..0ae1771 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -359,25 +359,15 @@ static void tegra_channel_fmt_align(struct tegra_vi_channel *chan,
 				    struct v4l2_pix_format *pix,
 				    unsigned int bpp)
 {
-	unsigned int align;
-	unsigned int min_width;
-	unsigned int max_width;
-	unsigned int width;
 	unsigned int min_bpl;
 	unsigned int max_bpl;
 	unsigned int bpl;
 
 	/*
-	 * The transfer alignment requirements are expressed in bytes. Compute
-	 * minimum and maximum values, clamp the requested width and convert
-	 * it back to pixels. Use bytesperline to adjust the width.
+	 * The transfer alignment requirements are expressed in bytes.
+	 * Clamp the requested width and height to the limits.
 	 */
-	align = lcm(SURFACE_ALIGN_BYTES, bpp);
-	min_width = roundup(TEGRA_MIN_WIDTH, align);
-	max_width = rounddown(TEGRA_MAX_WIDTH, align);
-	width = roundup(pix->width * bpp, align);
-
-	pix->width = clamp(width, min_width, max_width) / bpp;
+	pix->width = clamp(pix->width, TEGRA_MIN_WIDTH, TEGRA_MAX_WIDTH);
 	pix->height = clamp(pix->height, TEGRA_MIN_HEIGHT, TEGRA_MAX_HEIGHT);
 
 	/* Clamp the requested bytes per line value. If the maximum bytes per
-- 
2.7.4