[igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: Add support for Y410/Y416 formats, v3.
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Mon Mar 18 10:33:45 UTC 2019
Y410 is packed with compressed a channel and only 32 bpp, like
10 bits RGB formats. Y416 is a packed 16 bits per component format.
Changes since v1:
- Rebase on top of upstream YUV changes.
Changes since v2:
- Discard alpha channel, not used upstream.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
lib/igt_color_encoding.c | 2 +
lib/igt_fb.c | 130 +++++++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/lib/igt_color_encoding.c b/lib/igt_color_encoding.c
index 9f9dc1439ee4..0ebdddcd49c5 100644
--- a/lib/igt_color_encoding.c
+++ b/lib/igt_color_encoding.c
@@ -154,6 +154,8 @@ static const struct color_encoding_format {
{ DRM_FORMAT_Y210, 65472.f, 4096.f, 60160.f, 4096.f, 32768.f, 61440.f },
{ DRM_FORMAT_Y212, 65520.f, 4096.f, 60160.f, 4096.f, 32768.f, 61440.f },
{ DRM_FORMAT_Y216, 65535.f, 4096.f, 60160.f, 4096.f, 32768.f, 61440.f },
+ { DRM_FORMAT_Y410, 1023.f, 64.f, 940.f, 64.f, 512.f, 960.f },
+ { DRM_FORMAT_Y416, 65535.f, 4096.f, 60160.f, 4096.f, 32768.f, 61440.f },
};
static const struct color_encoding_format *lookup_fourcc(uint32_t fourcc)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 727a3f2b0fb8..3f7f1d2d9d43 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -221,6 +221,16 @@ static const struct format_desc_struct {
.num_planes = 3, .plane_bpp = { 8, 8, 8, },
.hsub = 2, .vsub = 1,
},
+ { .name = "Y410", .depth = -1, .drm_id = DRM_FORMAT_Y410,
+ .cairo_id = CAIRO_FORMAT_RGB96F,
+ .num_planes = 1, .plane_bpp = { 32, },
+ .hsub = 1, .vsub = 1,
+ },
+ { .name = "Y416", .depth = -1, .drm_id = DRM_FORMAT_Y416,
+ .cairo_id = CAIRO_FORMAT_RGB96F,
+ .num_planes = 1, .plane_bpp = { 64, },
+ .hsub = 1, .vsub = 1,
+ },
{ .name = "P010", .depth = -1, .drm_id = DRM_FORMAT_P010,
.cairo_id = CAIRO_FORMAT_RGB96F,
.num_planes = 2, .plane_bpp = { 16, 32 },
@@ -684,6 +694,28 @@ static void clear_yuv_buffer(struct igt_fb *fb)
fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
break;
+ case DRM_FORMAT_Y410:
+ wmemset(ptr + fb->offsets[0],
+ full_range ? 0xe0000200 : 0xe0010200,
+ fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
+ break;
+ case DRM_FORMAT_Y416: {
+ struct ayuv16 { uint16_t u, y, v, a; };
+ const struct ayuv16 pixel = {
+ .a = 0xffff,
+ .v = full_range ? 0 : 0x1000,
+ .y = 0x8000,
+ .u = full_range ? 0 : 0x1000
+ };
+
+ for (int i = 0; i < fb->plane_height[0]; i++) {
+ struct ayuv16 *cur = ptr + fb->offsets[0] + fb->strides[0] * i;
+
+ for (int j = 0; i < fb->plane_width[0]; j++)
+ *cur++ = pixel;
+ }
+ break;
+ }
}
igt_fb_unmap_buffer(fb, ptr);
@@ -1941,6 +1973,7 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
params->uv_inc = 4;
break;
+ case DRM_FORMAT_Y416:
case DRM_FORMAT_XYUV8888:
params->y_inc = 4;
params->uv_inc = 4;
@@ -1971,6 +2004,7 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_Y212:
case DRM_FORMAT_Y216:
case DRM_FORMAT_XYUV8888:
+ case DRM_FORMAT_Y416:
params->y_stride = fb->strides[0];
params->uv_stride = fb->strides[0];
break;
@@ -2045,6 +2079,12 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
params->v_offset = fb->offsets[0] + 6;
break;
+ case DRM_FORMAT_Y416:
+ params->y_offset = fb->offsets[0] + 2;
+ params->u_offset = fb->offsets[0];
+ params->v_offset = fb->offsets[0] + 4;
+ break;
+
case DRM_FORMAT_XYUV8888:
params->y_offset = fb->offsets[0] + 1;
params->u_offset = fb->offsets[0] + 2;
@@ -2273,6 +2313,7 @@ static void convert_yuv16_to_float(struct fb_convert *cvt)
}
ptr += float_stride;
+
y += params.y_stride / sizeof(*y);
if ((src_fmt->vsub == 1) || (i % src_fmt->vsub)) {
@@ -2374,6 +2415,85 @@ static void convert_float_to_yuv16(struct fb_convert *cvt)
}
}
+static void convert_Y410_to_float(struct fb_convert *cvt)
+{
+ int i, j;
+ const uint32_t *yuyv;
+ uint32_t *buf;
+ float *ptr = cvt->dst.ptr;
+ unsigned int float_stride = cvt->dst.fb->strides[0] / sizeof(*ptr);
+ unsigned int yuyv_stride = cvt->src.fb->strides[0] / sizeof(*yuyv);
+ struct igt_mat4 m = igt_ycbcr_to_rgb_matrix(cvt->src.fb->drm_format,
+ cvt->dst.fb->drm_format,
+ cvt->src.fb->color_encoding,
+ cvt->src.fb->color_range);
+
+ igt_assert(cvt->src.fb->drm_format == DRM_FORMAT_Y410 &&
+ cvt->dst.fb->drm_format == IGT_FORMAT_FLOAT);
+
+ yuyv = buf = convert_src_get(cvt);
+
+ for (i = 0; i < cvt->dst.fb->height; i++) {
+ for (j = 0; j < cvt->dst.fb->width; j++) {
+ /* Convert 2x1 pixel blocks */
+ struct igt_vec4 yuv;
+ struct igt_vec4 rgb;
+
+ yuv.d[0] = (yuyv[j] >> 10) & 0x3ff;
+ yuv.d[1] = yuyv[j] & 0x3ff;
+ yuv.d[2] = (yuyv[j] >> 20) & 0x3ff;
+ yuv.d[3] = 1.f;
+
+ rgb = igt_matrix_transform(&m, &yuv);
+
+ write_rgbf(&ptr[j * 3], &rgb);
+ }
+
+ ptr += float_stride;
+ yuyv += yuyv_stride;
+ }
+
+ convert_src_put(cvt, buf);
+}
+
+static void convert_float_to_Y410(struct fb_convert *cvt)
+{
+ int i, j;
+ uint32_t *yuyv = cvt->dst.ptr;
+ const float *ptr = cvt->src.ptr;
+ unsigned float_stride = cvt->src.fb->strides[0] / sizeof(*ptr);
+ unsigned yuyv_stride = cvt->dst.fb->strides[0] / sizeof(*yuyv);
+ struct igt_mat4 m = igt_rgb_to_ycbcr_matrix(cvt->src.fb->drm_format,
+ cvt->dst.fb->drm_format,
+ cvt->dst.fb->color_encoding,
+ cvt->dst.fb->color_range);
+
+ igt_assert(cvt->src.fb->drm_format == IGT_FORMAT_FLOAT &&
+ cvt->dst.fb->drm_format == DRM_FORMAT_Y410);
+
+ for (i = 0; i < cvt->dst.fb->height; i++) {
+ for (j = 0; j < cvt->dst.fb->width; j++) {
+ struct igt_vec4 rgb;
+ struct igt_vec4 yuv;
+ uint16_t y, cb, cr;
+
+ read_rgbf(&rgb, &ptr[j * 3]);
+
+ yuv = igt_matrix_transform(&m, &rgb);
+ y = yuv.d[0];
+ cr = yuv.d[1];
+ cb = yuv.d[2];
+
+ yuyv[j] = ((cr & 0x3ff) << 0) |
+ ((y & 0x3ff) << 10) |
+ ((cb & 0x3ff) << 20);
+ }
+
+ ptr += float_stride;
+ yuyv += yuyv_stride;
+ }
+}
+
static void convert_pixman(struct fb_convert *cvt)
{
pixman_format_code_t src_pixman = drm_format_to_pixman(cvt->src.fb->drm_format);
@@ -2463,8 +2583,12 @@ static void fb_convert(struct fb_convert *cvt)
case DRM_FORMAT_Y210:
case DRM_FORMAT_Y212:
case DRM_FORMAT_Y216:
+ case DRM_FORMAT_Y416:
convert_yuv16_to_float(cvt);
return;
+ case DRM_FORMAT_Y410:
+ convert_Y410_to_float(cvt);
+ return;
}
} else if (cvt->src.fb->drm_format == IGT_FORMAT_FLOAT) {
switch (cvt->dst.fb->drm_format) {
@@ -2474,8 +2598,12 @@ static void fb_convert(struct fb_convert *cvt)
case DRM_FORMAT_Y210:
case DRM_FORMAT_Y212:
case DRM_FORMAT_Y216:
+ case DRM_FORMAT_Y416:
convert_float_to_yuv16(cvt);
return;
+ case DRM_FORMAT_Y410:
+ convert_float_to_Y410(cvt);
+ return;
}
}
@@ -2942,6 +3070,8 @@ bool igt_format_is_yuv(uint32_t drm_format)
case DRM_FORMAT_Y210:
case DRM_FORMAT_Y212:
case DRM_FORMAT_Y216:
+ case DRM_FORMAT_Y410:
+ case DRM_FORMAT_Y416:
case DRM_FORMAT_YUYV:
case DRM_FORMAT_YVYU:
case DRM_FORMAT_UYVY:
--
2.20.1
More information about the igt-dev
mailing list