Skip to contentSkip to conversation

Add support for DRM_FORMAT_NV{24,42}

PATCH In review Geert Uytterhoeven 2 participants 7 messages Jul 5, 2023 – Jul 7, 2023

lore
Share & tools
lore
#0 lore raw

cover Add support for DRM_FORMAT_NV{24,42}

Hi all,

This patch series adds support for semi-planar YUV formats with non-subsampled chroma planes.

It has been tested with the shmob_drm driver on the R-Mobile A1-based Atmark Techno Armadillo-800-EVA development board.

Thanks for your comments!

Geert Uytterhoeven (3):
util: Add NV24 and NV42 frame buffer formats
util: Add pattern support for DRM_FORMAT_NV{24,42}
modetest: Add support for DRM_FORMAT_NV{24,42}

 tests/modetest/buffers.c | 20 ++++++++++++++++++++
 tests/util/format.c      |  2 ++
 tests/util/pattern.c     |  4 ++++
 3 files changed, 26 insertions(+)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/3 util: Add NV24 and NV42 frame buffer formats

Add the missing entries for semi-planar YUV formats with non-subsampled chroma planes.

---
 tests/util/format.c | 2 ++
 1 file changed, 2 insertions(+)
tests/util/format.c +2 -0
index 1ca1b82ce947b2f4..f825027227ddba24 100644
@@ -51,6 +51,8 @@ static const struct util_format_info format_info[] = {
 	{ DRM_FORMAT_NV21, "NV21", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 2) },
 	{ DRM_FORMAT_NV16, "NV16", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
 	{ DRM_FORMAT_NV61, "NV61", MAKE_YUV_INFO(YUV_YCrCb, 2, 1, 2) },
+	{ DRM_FORMAT_NV24, "NV24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
+	{ DRM_FORMAT_NV42, "NV42", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 2) },
 	/* YUV planar */
 	{ DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
 	{ DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
Signature · 1 line
2.34.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH libdrm 1/3] util: Add NV24 and NV42 frame buffer formats

Hi Geert,

Thank you for the patch.

Quoted 4 lines · Geert Uytterhoeven

Add the missing entries for semi-planar YUV formats with non-subsampled chroma planes.

Quoted 17 lines
---
 tests/util/format.c | 2 ++
 1 file changed, 2 insertions(+)
tests/util/format.c +2 -0
index 1ca1b82ce947b2f4..f825027227ddba24 100644
@@ -51,6 +51,8 @@ static const struct util_format_info format_info[] = {
 	{ DRM_FORMAT_NV21, "NV21", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 2) },
 	{ DRM_FORMAT_NV16, "NV16", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
 	{ DRM_FORMAT_NV61, "NV61", MAKE_YUV_INFO(YUV_YCrCb, 2, 1, 2) },
+	{ DRM_FORMAT_NV24, "NV24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
+	{ DRM_FORMAT_NV42, "NV42", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 2) },
 	/* YUV planar */
 	{ DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
 	{ DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
Signature · 3 lines
Regards,

Laurent Pinchart
#3 lore raw

PATCH 2/3 util: Add pattern support for DRM_FORMAT_NV{24, 42}

In reply to Geert Uytterhoeven

Add support for drawing the SMPTE and tiles patterns in buffers using semi-planar YUV formats with non-subsampled chroma planes.

---
 tests/util/pattern.c | 4 ++++
 1 file changed, 4 insertions(+)
tests/util/pattern.c +4 -0
index 158c0b160a2ee870..f45a26ccec38f202 100644
@@ -698,6 +698,8 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3],
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 		u = info->yuv.order & YUV_YCbCr ? planes[1] : planes[1] + 1;
 		v = info->yuv.order & YUV_YCrCb ? planes[1] : planes[1] + 1;
 		return fill_smpte_yuv_planar(&info->yuv, planes[0], u, v,
@@ -1023,6 +1025,8 @@ static void fill_tiles(const struct util_format_info *info, void *planes[3],
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 		u = info->yuv.order & YUV_YCbCr ? planes[1] : planes[1] + 1;
 		v = info->yuv.order & YUV_YCrCb ? planes[1] : planes[1] + 1;
 		return fill_tiles_yuv_planar(info, planes[0], u, v,
Signature · 1 line
2.34.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH libdrm 2/3] util: Add pattern support for DRM_FORMAT_NV{24,42}

Hi Geert,

Thank you for the patch.

Quoted 4 lines · Geert Uytterhoeven

Add support for drawing the SMPTE and tiles patterns in buffers using semi-planar YUV formats with non-subsampled chroma planes.

Quoted 26 lines
---
 tests/util/pattern.c | 4 ++++
 1 file changed, 4 insertions(+)
tests/util/pattern.c +4 -0
index 158c0b160a2ee870..f45a26ccec38f202 100644
@@ -698,6 +698,8 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3],
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 		u = info->yuv.order & YUV_YCbCr ? planes[1] : planes[1] + 1;
 		v = info->yuv.order & YUV_YCrCb ? planes[1] : planes[1] + 1;
 		return fill_smpte_yuv_planar(&info->yuv, planes[0], u, v,
@@ -1023,6 +1025,8 @@ static void fill_tiles(const struct util_format_info *info, void *planes[3],
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 		u = info->yuv.order & YUV_YCbCr ? planes[1] : planes[1] + 1;
 		v = info->yuv.order & YUV_YCrCb ? planes[1] : planes[1] + 1;
 		return fill_tiles_yuv_planar(info, planes[0], u, v,
Signature · 3 lines
Regards,

Laurent Pinchart
#5 lore raw

PATCH 3/3 modetest: Add support for DRM_FORMAT_NV{24,42}

In reply to Geert Uytterhoeven

Add support for creating buffers using semi-planar YUV formats with non-subsampled chroma planes.

---
 tests/modetest/buffers.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
tests/modetest/buffers.c +20 -0
index 0b55aeddfef9a854..0605b12552bb8eec 100644
@@ -129,6 +129,8 @@ bo_create(int fd, unsigned int format,
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 	case DRM_FORMAT_YUV420:
 	case DRM_FORMAT_YVU420:
 		bpp = 8;
@@ -208,6 +210,11 @@ bo_create(int fd, unsigned int format,
 		virtual_height = height * 2;
 		break;
 
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
+		virtual_height = height * 3;
+		break;
+
 	default:
 		virtual_height = height;
 		break;
@@ -255,6 +262,19 @@ bo_create(int fd, unsigned int format,
 		planes[1] = virtual + offsets[1];
 		break;
 
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
+		offsets[0] = 0;
+		handles[0] = bo->handle;
+		pitches[0] = bo->pitch;
+		pitches[1] = pitches[0] * 2;
+		offsets[1] = pitches[0] * height;
+		handles[1] = bo->handle;
+
+		planes[0] = virtual;
+		planes[1] = virtual + offsets[1];
+		break;
+
 	case DRM_FORMAT_YUV420:
 	case DRM_FORMAT_YVU420:
 		offsets[0] = 0;
Signature · 1 line
2.34.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH libdrm 3/3] modetest: Add support for DRM_FORMAT_NV{24, 42}

Hi Geert,

Thank you for the patch.

Quoted 4 lines · Geert Uytterhoeven

Add support for creating buffers using semi-planar YUV formats with non-subsampled chroma planes.

Quoted 49 lines
---
 tests/modetest/buffers.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
tests/modetest/buffers.c +20 -0
index 0b55aeddfef9a854..0605b12552bb8eec 100644
@@ -129,6 +129,8 @@ bo_create(int fd, unsigned int format,
 	case DRM_FORMAT_NV21:
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
 	case DRM_FORMAT_YUV420:
 	case DRM_FORMAT_YVU420:
 		bpp = 8;
@@ -208,6 +210,11 @@ bo_create(int fd, unsigned int format,
 		virtual_height = height * 2;
 		break;
 
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
+		virtual_height = height * 3;
+		break;
+
 	default:
 		virtual_height = height;
 		break;
@@ -255,6 +262,19 @@ bo_create(int fd, unsigned int format,
 		planes[1] = virtual + offsets[1];
 		break;
 
+	case DRM_FORMAT_NV24:
+	case DRM_FORMAT_NV42:
+		offsets[0] = 0;
+		handles[0] = bo->handle;
+		pitches[0] = bo->pitch;
+		pitches[1] = pitches[0] * 2;
+		offsets[1] = pitches[0] * height;
+		handles[1] = bo->handle;
+
+		planes[0] = virtual;
+		planes[1] = virtual + offsets[1];
+		break;
+
 	case DRM_FORMAT_YUV420:
 	case DRM_FORMAT_YVU420:
 		offsets[0] = 0;
Signature · 3 lines
Regards,

Laurent Pinchart