Commit 728c15b4 authored by Jonas Karlman's avatar Jonas Karlman Committed by Heiko Stuebner
Browse files

drm/fourcc: Add NV20 and NV30 YUV formats 



DRM_FORMAT_NV20 and DRM_FORMAT_NV30 formats is the 2x1 and non-subsampled
variant of NV15, a 10-bit 2-plane YUV format that has no padding between
components. Instead, luminance and chrominance samples are grouped into 4s
so that each group is packed into an integer number of bytes:

YYYY = UVUV = 4 * 10 bits = 40 bits = 5 bytes

The '20' and '30' suffix refers to the optimum effective bits per pixel
which is achieved when the total number of luminance samples is a multiple
of 4.

V2: Added NV30 format

Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Reviewed-by: default avatarSandy Huang <hjc@rock-chips.com>
Reviewed-by: default avatarChristopher Obbard <chris.obbard@collabora.com>
Tested-by: default avatarChristopher Obbard <chris.obbard@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231023173718.188102-2-jonas@kwiboo.se
parent 215737e3

drivers/gpu/drm/drm_fourcc.c

+8 −0
Original line number Diff line number Diff line
@@ -299,6 +299,14 @@ const struct drm_format_info *__drm_format_info(u32 format) 
		  .num_planes = 2, .char_per_block = { 5, 5, 0 },

		  .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2,

		  .vsub = 2, .is_yuv = true },

		{ .format = DRM_FORMAT_NV20,		.depth = 0,

		  .num_planes = 2, .char_per_block = { 5, 5, 0 },

		  .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2,

		  .vsub = 1, .is_yuv = true },

		{ .format = DRM_FORMAT_NV30,		.depth = 0,

		  .num_planes = 2, .char_per_block = { 5, 5, 0 },

		  .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 1,

		  .vsub = 1, .is_yuv = true },

		{ .format = DRM_FORMAT_Q410,		.depth = 0,

		  .num_planes = 3, .char_per_block = { 2, 2, 2 },

		  .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 1,

include/uapi/drm/drm_fourcc.h

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ extern "C" { 
 * index 1 = Cr:Cb plane, [39:0] Cr1:Cb1:Cr0:Cb0 little endian

 */

#define DRM_FORMAT_NV15		fourcc_code('N', 'V', '1', '5') /* 2x2 subsampled Cr:Cb plane */

#define DRM_FORMAT_NV20		fourcc_code('N', 'V', '2', '0') /* 2x1 subsampled Cr:Cb plane */

#define DRM_FORMAT_NV30		fourcc_code('N', 'V', '3', '0') /* non-subsampled Cr:Cb plane */



/*

 * 2 plane YCbCr MSB aligned