blob: a21447a85eb2d7b7fd6a5edaf4b1499018ead757 [file] [log] [blame]
From 0b8f9404577b41d52f795324d51a931b03d2a65f Mon Sep 17 00:00:00 2001
From: Fritz Koenig <frkoenig@chromium.org>
Date: Tue, 2 Jun 2020 15:04:52 -0700
Subject: [PATCH] HACK: CHROMIUM: v4l2: Add V4L2_PIX_FMT_NV12_UBWC description
V4L2_PIX_FMT_NV12_UBWC is a temporary format that will be
used until v4l2 supports modifiers to pass buffer layout
information.
BUG=b:157938887
TEST=dmesg no longer has splats when playing video
Signed-off-by: Fritz Koenig <frkoenig@chromium.org>
Change-Id: I958fb5144653c9d3ddaa27556161f4dbdf03919e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2225935
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Commit-Queue: Douglas Anderson <dianders@chromium.org>
(cherry picked from commit 4ace7f6b8ff57951a70f8af266c226c2ae21827e)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2720786
Tested-by: Stephen Boyd <swboyd@chromium.org>
Auto-Submit: Stephen Boyd <swboyd@chromium.org>
Commit-Queue: Stephen Boyd <swboyd@chromium.org>
---
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index fddba75d90745811d6936090af252881ed248c73..eae478431d2b19b4b7e5b41465919d255bd85d85 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1358,6 +1358,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_NV12_16L16: descr = "Y/CbCr 4:2:0 (16x16 Linear)"; break;
case V4L2_PIX_FMT_NV12_32L32: descr = "Y/CbCr 4:2:0 (32x32 Linear)"; break;
case V4L2_PIX_FMT_P010_4L4: descr = "10-bit Y/CbCr 4:2:0 (4x4 Linear)"; break;
+ case V4L2_PIX_FMT_NV12_UBWC: descr = "Y/CbCr 4:2:0 UBWC"; break;
case V4L2_PIX_FMT_NV12M: descr = "Y/CbCr 4:2:0 (N-C)"; break;
case V4L2_PIX_FMT_NV21M: descr = "Y/CrCb 4:2:0 (N-C)"; break;
case V4L2_PIX_FMT_NV16M: descr = "Y/CbCr 4:2:2 (N-C)"; break;
--
2.38.1.584.g0f3c55d4c2-goog