From patchwork Thu Feb 6 18:02:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 862820 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 F35EA198A08 for ; Thu, 6 Feb 2025 18:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738865012; cv=none; b=gMdTZwT7U8pbELLxwsC1UHDLBBjLAATexwCPqzMPPyc97Jtfcd+IG+S4q7o17/q/HL17gzX+ON0yYrrvuh4Stl0O31xm7z6kR2pXXGLXrV1P1GBvbsNwFIfwHMMaiAiYR9wOGN1MOT4rqaAOkngmOFOGwo8E6tZV8vSbBG73sh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738865012; c=relaxed/simple; bh=VQCtCvsac16QKquJuGnbgwgTL32s+djawtsmmPVSIGI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aDhRf1kG64dCwWbLxgDsMp28NclliHrXCYOkIzhCM4f/tJ2/0zTC+IRPo/BHDSRRXb5Qoe2uV6pPAZwo0thY8SIbZ1XPbVAW3PXpaYqQZxg+AzO41rQYgLzNiRRazJd9sOlXE/L+co112SE0V3cM1xl0e7b55PDjomGhIzfkgco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=iW9zT/X9; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="iW9zT/X9" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38dc6d9b292so100493f8f.2 for ; Thu, 06 Feb 2025 10:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1738865009; x=1739469809; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kR3OVycuCmoqTqRR5D0uJANjV33MoT0CPRB7lcsHjJo=; b=iW9zT/X9Wl24BwGF/orVoDcmUSk7kvKdtlNwPRmY+oeJSma9N/EcDczxfaT6mMptkO /kjwCIZhAHThBVx3WpVYdxr/HDc1V5TLdwqoG7ZPAk744p0Y0pOfLErMVEeO1JWa029w KQeA8INpFGHNRWWXOdh/hL4+K0fS/JzJNIlejbJAVdSXJpmN6gRnsRzWQNNfjdFnguDx 7VDVlWO6u0aX+t28jaU/eaoyh2/JPgNZISszVZ4QQgO+M/nka1m+THtT8eV5SSSvOjqt xlS+Ps3AQKapubxOEt6NB8UXWLyh89bUZdtLjq49iK1PU4/oCPL3tYcxGVrBxYauAEf6 yYng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738865009; x=1739469809; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kR3OVycuCmoqTqRR5D0uJANjV33MoT0CPRB7lcsHjJo=; b=sin2n7Rgctf6p06x2f1yn3ELXrt9XQxOsK7+OxJGDqIcGP/h48/GlLgUpW6ltbbOCk YXEuvpt6m/WbqqqHWswMxUWYRAtEJe+Ac+GXZl2pHlf947LMVHz2Pn3/wu3nxLjnibFt lRoQnFTjwyDVIjTLFwouIGslSplMhMngg+iWUdEzxyyztjGijf9eNKxTwY/VVC0ujbvj MVfErRTgH3pR50WJyJAyUee0Zlep7rKvCBvkskc9rV2ICs6mxs2HzLyWdijtotJxhNVW uO94dPipcAvjIzzCoePj7DSw3VytV16+qVpP27KrzFsBfxJjGXYN7p1ExMM6AYESUEZg rIRQ== X-Forwarded-Encrypted: i=1; AJvYcCV/FFfBORg8qGb2nowD10rc1HvqtPiI7WjqIlUe2cFVWls0lqRvL8XCNTA2F6bk54NVWVVDpTq1orP8aw==@vger.kernel.org X-Gm-Message-State: AOJu0Yz5mD6B9W5O7cuL9v2FwcXDXiC2sWoJ4aoYUPa/Ej4XeQ6OLmgz 5Lu8K+J2qKiZFCtn88MnvBnqYRW+4aRD3+4uOWfoisFthSnIEUC5sYkeMvFOb6A= X-Gm-Gg: ASbGncvgKiF/nXye3TgQrEdWbqX4F7TnJDVx1LiWLDufUtCAAJCTZuohHhJwbR21aoL fsBg2r33jg8uaEOMw4AZibeOZxakxIZmLIX/o6QMONZluBnbXREfBByws0889QhUL1tN0a+nOpI iVv3epRT7n/RzGWH7kLp2AwqVCXRFS5is6lvkYyD5jKXCCw6HqOui2S2H/BUK6V2tJs7m3jP/oV ygWzjgYdUAl8vZNrHpzYkw94p1eZdg2l7nHlsNbsats8NEzkt4B97OaAH0im60cQXt4a97dHoKO SOh0hfE= X-Google-Smtp-Source: AGHT+IEoc/9XOwlp0DvnbUlLjy/NlRiR7j2XwPEULfDZEUfoxbrwXS8TYDaBV4uvHBf5o/4F0pxwsg== X-Received: by 2002:a05:6000:1886:b0:38d:b2e4:6d98 with SMTP id ffacd0b85a97d-38db491f10cmr4937014f8f.42.1738865009088; Thu, 06 Feb 2025 10:03:29 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-38dbdd3856fsm2278858f8f.28.2025.02.06.10.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 10:03:28 -0800 (PST) From: Dave Stevenson Date: Thu, 06 Feb 2025 18:02:35 +0000 Subject: [PATCH v2 2/5] media: ioctl: Add pixel formats NV12MT_COL128 and NV12MT_10_COL128 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-media-rpi-hevc-dec-v2-2-69353c8805b2@raspberrypi.com> References: <20250206-media-rpi-hevc-dec-v2-0-69353c8805b2@raspberrypi.com> In-Reply-To: <20250206-media-rpi-hevc-dec-v2-0-69353c8805b2@raspberrypi.com> To: Sakari Ailus , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , John Cox , Dom Cobley , review list , Ezequiel Garcia Cc: John Cox , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Dave Stevenson X-Mailer: b4 0.14.1 Add V4L2_PIXFMT_NV12MT_COL128 and V4L2_PIXFMT_NV12MT_10_COL128 to describe the Raspberry Pi HEVC decoder NV12 multiplanar formats. Signed-off-by: Dave Stevenson --- drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++ include/uapi/linux/videodev2.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 0304daa8471d..e510e375a871 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1377,7 +1377,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_NV16M: descr = "Y/UV 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV61M: descr = "Y/VU 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV12MT: descr = "Y/UV 4:2:0 (64x32 MB, N-C)"; break; + case V4L2_PIX_FMT_NV12MT_COL128: descr = "Y/CbCr 4:2:0 (128b cols)"; break; case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/UV 4:2:0 (16x16 MB, N-C)"; break; + case V4L2_PIX_FMT_NV12MT_10_COL128: descr = "10-bit Y/CbCr 4:2:0 (128b cols)"; break; case V4L2_PIX_FMT_P012M: descr = "12-bit Y/UV 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_YUV420M: descr = "Planar YUV 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_YVU420M: descr = "Planar YVU 4:2:0 (N-C)"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index e7c4dce39007..ce07b242c1a0 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -687,6 +687,10 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 tiles */ #define V4L2_PIX_FMT_NV12M_8L128 v4l2_fourcc('N', 'A', '1', '2') /* Y/CbCr 4:2:0 8x128 tiles */ #define V4L2_PIX_FMT_NV12M_10BE_8L128 v4l2_fourcc_be('N', 'T', '1', '2') /* Y/CbCr 4:2:0 10-bit 8x128 tiles */ +#define V4L2_PIX_FMT_NV12MT_COL128 v4l2_fourcc('N', 'c', '1', '2') /* 12 Y/CbCr 4:2:0 128 pixel wide column */ +#define V4L2_PIX_FMT_NV12MT_10_COL128 v4l2_fourcc('N', 'c', '3', '0') + /* Y/CbCr 4:2:0 10bpc, 3x10 packed as 4 bytes in a 128 bytes / 96 pixel wide column */ + /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */