From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 5D6E22F9D91 for ; Wed, 8 Oct 2025 07:31:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759908708; cv=none; b=oUpfueG8i18nmKEzMUVbYKCPy31PLLmaJGITEIiCK+rhedbzZqfQj0uPBC6vAcRVYmBCmLNk/GsVACkVjqlchQ1OprNWtRUAxGeQVerOwSMtj/4QrX2adDlW0wcgZMELshI4eL1k1yN7tknOVQTw2rtSckVgyD6CFRXeZGPQzi4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759908708; c=relaxed/simple; bh=RlVItK7iXy6OjCYCwpNfqBWyShuPqBGkj/6mzWc3l4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M9fPaCUclFBHsQ03O9qJZ3zHCjoHudghWezw+bFTek82FdC5gN93jZOQKI88eNNqm/tQr+Xp9mQkTzgnyLCqDb6NyxOsI8tLwMdnoKC0qJ5p0bYnpfguoCbZtxXRvRmOu3sFKShecH/lfaWRYS2mRYq2oS10Sbwzqs/pNUJA2TA= 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=GVC4787a; arc=none smtp.client-ip=209.85.167.44 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="GVC4787a" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-57ea78e0618so8108092e87.0 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=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=aSzLMseudyhbfpSsCkBHegf+R/CRf/bD8WfdY1dPA6A=; b=GVC4787assLcQv0OLg+sqbJEBf8DKeOv3V6TrUbeel4tUpU/X0HN+2Mwd30HDBM+FR T16gCBHX8qq/cHQdVwyYhS0HiAaa3rWljIvuVfxWNY1oqaPEommbhKi/WviTVPRuB3JQ zIKeHhw+qctXMU9bgsbTIKLzp1uXMce4C18KEaJ+K3cT4OJ+gaSbBYasyIEVu83BYGOH LtaF8JjozhK591d/FM0aJ6vYViSlB5kbaVtkyj/60Im4NsF6/Cg69urbDC3l6Cb6A9Sq sXSqh2ELo5UyvH6D9NE4QzizhxYRmTEUcxNCeLGIUPg6htGwWo1ekcQtLMnPJOdFZswl 4uBQ== 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=RhqmMoQKVK/vuWAvceQdK9GhNR4ZrTyfpzI8SArxXxBPC8XlW7cRqKfKxjcAzI2agQ hCz+3O2AlyaEM5hU+nKZiLlyBJjCLtmX/XvZGq+rdXuGjxNvt/wkp/3quDgjT5hMlmVw +Jg4XX5VL7OaFYJr1DxYSOXFf9igqY8TH3yiTfO2zGDEGvuS/vM2hoWQ281VhNXH8Z5g /Nv9vNknRqHRyd7MMYp/j+IQS9Zuu1Wmr6BuuOQSzqBJX52o1dXB6vI5YUuyywna68NI f0i6YHXyiY9siPM8p2dss2Z/rVdcPmUA3vSH6filAEQoMBg0OuroMdtUdysl6npOf/Vx tl+A== X-Forwarded-Encrypted: i=1; AJvYcCWiIHaNdfrcRK8uMRXDqi/O5uG3TBPRJe9XytF7OqTPYICAZ514+x7GYFLYYyfYk/F9DN6fpI6lGVRVEg==@vger.kernel.org X-Gm-Message-State: AOJu0YxbQuLyJLqJwxe+oApc1YNtwwUgH6dBgWRc3kLspOxEl4nhSdHo DHF/8Zx9IH9/LcNZN5lnaNuGY3DCOKU1BJgCheWjDUS/Lp2lDs+mv6kw X-Gm-Gg: ASbGncsCKYJQiWBNvwcZcEYo1LZtTIU21+Ulp4fHCdso/BpsjDrX7Us5PETizTqBTcm BfktGKZ7HZxH8xeHOvyVvv2Jj6xn/SQEXxOmtlsIX18bh0Nh9Uw3w3uYCDS9lb9HOuLtux9Ld6x QpSLw3hapfp9DHWyvsGtztvimENv2LyUrgII4QKSnRIbJDx6OLVnw3zwNGbzg/tUQ3gcBuPo4Ba fmyqv55INExK4OC5pJgduPEIMXbDnXOOkAwROVHv1vS48USrfg1eMyQ4zjGO2bvPcKAnud3pT2M 43yQ3nubok+1I0fqQRn0k5ONV+iOmruXoqhcqsiOynUFUOHtc6f3+PdzMFXkW2AcsMff9VilOq/ 25fsvy/rDZ5sdQswJrU/fvResg3GpGCfkwlEJUQ== 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-media@vger.kernel.org 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