From nobody Thu Apr 2 18:47:39 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73E3F38C418 for ; Tue, 3 Mar 2026 08:43:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772527390; cv=none; b=Eh+m61ARMUX1u3k+ndGCm4c9wMt1v7fk6HwE2WSwdKgDx9gnbxArjlxc7Hl423zYZfJz7jJTdzz3T2Iiyy/yE8NTf7aJXmqCnjmgGQ2UQ73CK3D75/HYoKNPk4LKetSj9yg2GIXx2+NLFm+yfQ9++94v7CKgKEE7jEjVZilXVnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772527390; c=relaxed/simple; bh=XkC6pC1Ht7QYhYz5xBTY+ZnKrbdM95bt/73kNqM5zOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RM6kMuejf9Azax57EoC0dK5ujA/0eqrhI1iCk6w0WL6aSpJ97xVBgld4oBOn60a4YqVlLoEGvhAnBMXN3NmM/m6+T3Z4yET/NDZxQ31lFsHrnzHuR1t/5/Qt34H8UCPZq7qMjoNqRcTEl4QNTl4O2Br0h9Y9vn25SKcOpNAUOo8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bkRpcI7m; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bkRpcI7m" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-389fa0d1040so76325191fa.2 for ; Tue, 03 Mar 2026 00:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772527384; x=1773132184; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=edep+Evwox4IxBSEQEcIkaZkpzUcbpvh4gwyQ5gLWYA=; b=bkRpcI7m/wVE5GZiNV3qWpemY4Hwjz4OfZj4KGlio9HVBZmLr2NQpE/QExWdsdhFd4 MrWG8dySCvIGFSBlL7C5ytRH2rS5g4IObLw+W21DVUZDnsAlLoZHeUugNzk+yWJItgKx 84FbZ0JFM7gJROyqBHSR71jWoRGJ3cq1H95LXU7SkeqK2voB08XQ1BAgOAcG9Rpy5T9C iObzz0miNJx/UdWO2wl3Jqtw2tC+J7PqRIyNDXN2MwjHaVJXwVPYSR1SZDHMPalTTpsR vhOt/7GnxpHkPliXRJia850tPLyYdiKG0u37u4az+9merit5JZvTg4B4f9gpcwOB8JJ1 8/uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772527384; x=1773132184; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=edep+Evwox4IxBSEQEcIkaZkpzUcbpvh4gwyQ5gLWYA=; b=GBqkcOcxdH45JUr4IqafENopOS1IQDR0xdB/dqKfkaxTualSplSMTyBqOoJ77JYuOc KfYqhhYkBl2vh4DhYtYI9zuYzjzv0bMQY99iwVzQgV8CZ6l37eNaXRJa9/gsb3HvBTuG +35pA+rDSWXlRga/XED0ySiY5i3R7SyUdcXhomQMB4UiychDwH96rg/xs9xYiw6V00oJ OERChuhWpClso7cNIpgMP/xMZhRndNjDc32GG/2fXq1MZZFB8JQm4GVWm6ZAhDYQcWkX HwcEtBiaW4DERdh3+ZsmrYsf7OCl0jxbC9Rv3w3eYnE7C35HfPKtkJ44zlrnl7uNUTNi q9cw== X-Gm-Message-State: AOJu0YxuB79HRFdWI2DsTOJUgnjkU33nJKpJeimGyvhdu/j67dfX8BK9 6TjmRXI2QypFjpBUV2/t/50+68k5ocbw+aCmwxThy2X2k7AWIT5OT99X X-Gm-Gg: ATEYQzyaY+tFCfdnfS9GlQrc7IjVmMZ/30Vo2y8ArkSWjAbWzBwwj0NjIUzzadvGurc HUWIST2esfcyyhoswmDS4qjlp4kMDZKVS2RityweaL4+joDeODSRovIfGallMSmJEvc/5UBBzy9 2lFmoDbOGuRXFT8GWiiqSwZ6iyA0cVy7dB3mQopiV65Kr2cEcf2GHqu5LCo36wtVcLufvdxq+if +8eNSPy3qgR25qhNisn9eghc/MEsuItUWvnLOV7UiuzHeCUHDn4x9mWgl5IWOEcsAWdHUtOo9Uw D2TkQhkZo1I9JHb2SUWNS7TjSc3XF2dh2uKlcB1mwyOIWpwCdJom32vIoB9iCJYY+2eOuInXk7y 5O7yUk2PX1ijA4Tro+avKIctTWoAxMe98WNTjT9CSLar2A3ETW7BBcmn14R2duNu6Y7Qq6m6zW3 D+ixhesYXteKIG X-Received: by 2002:a05:651c:2112:b0:38a:34a:7823 with SMTP id 38308e7fff4ca-38a034a7c3dmr110038231fa.21.1772527383803; Tue, 03 Mar 2026 00:43:03 -0800 (PST) Received: from xeon ([188.163.112.72]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-389f30227a9sm32599471fa.42.2026.03.03.00.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 00:43:03 -0800 (PST) From: Svyatoslav Ryhel To: Thierry Reding , Thierry Reding , Mikko Perttunen , David Airlie , Simona Vetter , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Mauro Carvalho Chehab , Greg Kroah-Hartman , Hans Verkuil , Svyatoslav Ryhel Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v7 10/15] staging: media: tegra-video: tegra20: adjust format align calculations Date: Tue, 3 Mar 2026 10:42:33 +0200 Message-ID: <20260303084239.15007-11-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303084239.15007-1-clamor95@gmail.com> References: <20260303084239.15007-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Expand supported formats structure with data_type and bit_width fields required for CSI support. Adjust tegra20_fmt_align by factoring out common bytesperline and sizeimage calculation logic shared by supported planar and non-planar formats and leaving planar-related correction under a switch. Tested-by: Luca Ceresoli # tegra20, parallel ca= mera Signed-off-by: Svyatoslav Ryhel Reviewed-by: Mikko Perttunen --- drivers/staging/media/tegra-video/tegra20.c | 39 ++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/staging/media/tegra-video/tegra20.c b/drivers/staging/= media/tegra-video/tegra20.c index c8afc6f2adf2..4b218b9fbc26 100644 --- a/drivers/staging/media/tegra-video/tegra20.c +++ b/drivers/staging/media/tegra-video/tegra20.c @@ -280,18 +280,13 @@ static void tegra20_fmt_align(struct v4l2_pix_format = *pix, unsigned int bpp) pix->width =3D clamp(pix->width, TEGRA20_MIN_WIDTH, TEGRA20_MAX_WIDTH); pix->height =3D clamp(pix->height, TEGRA20_MIN_HEIGHT, TEGRA20_MAX_HEIGHT= ); =20 + pix->bytesperline =3D roundup(pix->width, 8) * bpp; + pix->sizeimage =3D pix->bytesperline * pix->height; + switch (pix->pixelformat) { - case V4L2_PIX_FMT_UYVY: - case V4L2_PIX_FMT_VYUY: - case V4L2_PIX_FMT_YUYV: - case V4L2_PIX_FMT_YVYU: - pix->bytesperline =3D roundup(pix->width, 2) * 2; - pix->sizeimage =3D roundup(pix->width, 2) * 2 * pix->height; - break; case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_YVU420: - pix->bytesperline =3D roundup(pix->width, 8); - pix->sizeimage =3D roundup(pix->width, 8) * pix->height * 3 / 2; + pix->sizeimage =3D pix->sizeimage * 3 / 2; break; } } @@ -576,20 +571,24 @@ static const struct tegra_vi_ops tegra20_vi_ops =3D { .vi_stop_streaming =3D tegra20_vi_stop_streaming, }; =20 -#define TEGRA20_VIDEO_FMT(MBUS_CODE, BPP, FOURCC) \ -{ \ - .code =3D MEDIA_BUS_FMT_##MBUS_CODE, \ - .bpp =3D BPP, \ - .fourcc =3D V4L2_PIX_FMT_##FOURCC, \ +#define TEGRA20_VIDEO_FMT(DATA_TYPE, BIT_WIDTH, MBUS_CODE, BPP, FOURCC) \ +{ \ + .img_dt =3D TEGRA_IMAGE_DT_##DATA_TYPE, \ + .bit_width =3D BIT_WIDTH, \ + .code =3D MEDIA_BUS_FMT_##MBUS_CODE, \ + .bpp =3D BPP, \ + .fourcc =3D V4L2_PIX_FMT_##FOURCC, \ } =20 static const struct tegra_video_format tegra20_video_formats[] =3D { - TEGRA20_VIDEO_FMT(UYVY8_2X8, 2, UYVY), - TEGRA20_VIDEO_FMT(VYUY8_2X8, 2, VYUY), - TEGRA20_VIDEO_FMT(YUYV8_2X8, 2, YUYV), - TEGRA20_VIDEO_FMT(YVYU8_2X8, 2, YVYU), - TEGRA20_VIDEO_FMT(UYVY8_2X8, 1, YUV420), - TEGRA20_VIDEO_FMT(UYVY8_2X8, 1, YVU420), + /* YUV422 */ + TEGRA20_VIDEO_FMT(YUV422_8, 16, UYVY8_2X8, 2, UYVY), + TEGRA20_VIDEO_FMT(YUV422_8, 16, VYUY8_2X8, 2, VYUY), + TEGRA20_VIDEO_FMT(YUV422_8, 16, YUYV8_2X8, 2, YUYV), + TEGRA20_VIDEO_FMT(YUV422_8, 16, YVYU8_2X8, 2, YVYU), + /* YUV420P */ + TEGRA20_VIDEO_FMT(YUV422_8, 16, UYVY8_2X8, 1, YUV420), + TEGRA20_VIDEO_FMT(YUV422_8, 16, UYVY8_2X8, 1, YVU420), }; =20 const struct tegra_vi_soc tegra20_vi_soc =3D { --=20 2.51.0