From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 92F332F9D84 for ; Wed, 8 Oct 2025 07:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759908707; cv=none; b=h/4q4KfeWJY+ojtZNi9knnD0ilRQ40nST/I+rfhhWsKdYq6OwRNip31Fq8fTXlDnwacKECe8f7j+wYOjwJJ1bEInJOpieJflILW+xnbN2Qc3xIDY47DXBitMkkCE14GfeU4cKTZmoAZfQe32bvvW8Ixo1UAYIQGke6/2VZXzgaE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759908707; c=relaxed/simple; bh=RlVItK7iXy6OjCYCwpNfqBWyShuPqBGkj/6mzWc3l4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kzUMOIiqHD4Ihyau9UbAbE/AoX6MHGP1vAYNvctttccuUIAJwBS8ybtx0a67m1P6/YFKfBAlC794csRFMxbi0+D9S+6NGmcE4D6HJi0EZkeIXp/NcVA0aMXGqI4RTwvhbx/GjQ3NuBrtgCTfGl/qcwCuWCvZGy3ebmBIVJHvDxo= 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=V32b6dg+; arc=none smtp.client-ip=209.85.167.54 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="V32b6dg+" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-59054fc6a45so3431654e87.3 for ; Wed, 08 Oct 2025 00:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759908702; x=1760513502; darn=lists.linux.dev; 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=aSzLMseudyhbfpSsCkBHegf+R/CRf/bD8WfdY1dPA6A=; b=V32b6dg+OgKkbANbnlom9cRZv2g83GuYN1uA2y4jiQezw4RjjbiohXG7QgBDJTH8I3 iJ5E11BskBHBbHkNEOzMnG+OTiHI13F+GmGRnMZWO9DTTWlezohDpwq9mFuB+yh/zxZT 3A1qlADHrB2zrPMbUNJgfjOGXux5DrRYAdItp0x67eUlWGDI/lM1RGZppYXALeEZUfp3 Ul+HVpFHjmkDwD5syrlwCZAvvVh5P2pnUv+GnzZ4fma5jHSnAYPJWZ3asJp6VGotsLs/ cWqlu0SgkfF0KbVFp6ZzPLCxDK3Cs2Yrqm92jsib0D3TxxTHLB91rCuGYZf3tnFjUUzv BypA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759908702; x=1760513502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aSzLMseudyhbfpSsCkBHegf+R/CRf/bD8WfdY1dPA6A=; b=xDEtZFuhNJ3NXAXMlGrp3K3JO+0pB7epIK8L9kBVAjoXDtE1rfRtUboQTho2AqRQYU GBHc2RF7SmhbQV+g4n7zU8nMBjyWcUWXssU9QTblyTt+VzbxdKbeWtU/97derjvmHuE5 9p4ox+elkkQ7LUP9TtFlICJJQIY27Nnl3EmA/9cyCimlkO9j0Dt043/dCLShTKDURH0O 5Zefg3zpo7zMmdhrQOmho6ERaAflmM6FNgYq26fLz6TL6kTsjonYmUFTlTlgO4Gn3yoG dZxn/xLIxT7UKKuVbuuBInNGaKZPstzPfKMctOXx5K/CWqROR4oSMlEJ8KpDbggz+kJy j8sA== X-Forwarded-Encrypted: i=1; AJvYcCXxsC5EJXPYhxl9NstUzp13EBPZBHmJkwLzS2e9dvPVldDwSME8wvTYYYWcq6qkYUvsXAkddl8a2/q4tuyG@lists.linux.dev X-Gm-Message-State: AOJu0YyjJgCkVTyb1hyC+d6YcIQmdPQOQYXRGhcAPog9GbywjG+rgK1S HNr6upImI3dVlspKGWnJurIUBjCryP/eMrEGq4/HFg+5mOwa7d/WpqSP X-Gm-Gg: ASbGnct1EeB9mW0VMQQLPpqUYhvkjjEM9Y5VXQThnvB224LlglRNThy+YFMEFsZkGbY 17BcJzgLu7mx9D39ws8L17c9pW3Z0KlGUe1vmUnPDDNhIieFEwurPRaRpvQYhLRFj8YgGszKyTW JN+cMppRdjjE0Brr6nwqsLl0SQOtnZmS3T+wEdEAc8rrwIo6LXn84c6XS6rTXzYH/GuIQpO5k7c irVbjjZ9Yo0qkjj6M6G3qkAre7voJkvk5/xevPF72LBe9i8wP0WsWekQHNE3TIhCA0rVGs3wGlK 5FX7uq3OwAZzE8tYALUntKpH6KRktg8vuTywH4Gs6Um/Kulq78w5mTAoaeMFyOQQtVg99DjJoDM MZn0u/5tM8BHhDRd+xy6BWzNkteXBQNqgDevV7w== X-Google-Smtp-Source: AGHT+IHu39faT6wHaoomwvg/rNoHvXVgG6hJojMOqYHlHDrQmtuFa3r7nNlT7bUvnJ6opz9y3ixRBw== X-Received: by 2002:a05:6512:1291:b0:57a:3d7e:7275 with SMTP id 2adb3069b0e04-5906dd53f68mr676945e87.36.1759908702179; Wed, 08 Oct 2025 00:31:42 -0700 (PDT) Received: from xeon.. ([188.163.112.70]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-58b0118d22bsm6911016e87.85.2025.10.08.00.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 00:31:41 -0700 (PDT) From: Svyatoslav Ryhel To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Prashant Gaikwad , Michael Turquette , Stephen Boyd , Mikko Perttunen , Linus Walleij , Mauro Carvalho Chehab , Greg Kroah-Hartman , Svyatoslav Ryhel , =?UTF-8?q?Jonas=20Schw=C3=B6bel?= , Dmitry Osipenko , Charan Pedumuru , Diogo Ivo , Aaron Kling , Arnd Bergmann Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v4 17/24] staging: media: tegra-video: tegra20: adjust format align calculations Date: Wed, 8 Oct 2025 10:30:39 +0300 Message-ID: <20251008073046.23231-18-clamor95@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251008073046.23231-1-clamor95@gmail.com> References: <20251008073046.23231-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Svyatoslav Ryhel --- 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 7c3ff843235d..ffaaa2bb8269 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 = clamp(pix->width, TEGRA20_MIN_WIDTH, TEGRA20_MAX_WIDTH); pix->height = clamp(pix->height, TEGRA20_MIN_HEIGHT, TEGRA20_MAX_HEIGHT); + pix->bytesperline = roundup(pix->width, 8) * bpp; + pix->sizeimage = 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 = roundup(pix->width, 2) * 2; - pix->sizeimage = roundup(pix->width, 2) * 2 * pix->height; - break; case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_YVU420: - pix->bytesperline = roundup(pix->width, 8); - pix->sizeimage = roundup(pix->width, 8) * pix->height * 3 / 2; + pix->sizeimage = pix->sizeimage * 3 / 2; break; } } @@ -576,20 +571,24 @@ static const struct tegra_vi_ops tegra20_vi_ops = { .vi_stop_streaming = tegra20_vi_stop_streaming, }; -#define TEGRA20_VIDEO_FMT(MBUS_CODE, BPP, FOURCC) \ -{ \ - .code = MEDIA_BUS_FMT_##MBUS_CODE, \ - .bpp = BPP, \ - .fourcc = V4L2_PIX_FMT_##FOURCC, \ +#define TEGRA20_VIDEO_FMT(DATA_TYPE, BIT_WIDTH, MBUS_CODE, BPP, FOURCC) \ +{ \ + .img_dt = TEGRA_IMAGE_DT_##DATA_TYPE, \ + .bit_width = BIT_WIDTH, \ + .code = MEDIA_BUS_FMT_##MBUS_CODE, \ + .bpp = BPP, \ + .fourcc = V4L2_PIX_FMT_##FOURCC, \ } static const struct tegra_video_format tegra20_video_formats[] = { - 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), }; const struct tegra_vi_soc tegra20_vi_soc = { -- 2.48.1