#define TEST_BUF_SIZE 50
 
+struct convert_to_gray8_result {
+       unsigned int dst_pitch;
+       const u8 expected[TEST_BUF_SIZE];
+};
+
 struct convert_to_rgb332_result {
        unsigned int dst_pitch;
        const u8 expected[TEST_BUF_SIZE];
        unsigned int pitch;
        struct drm_rect clip;
        const u32 xrgb8888[TEST_BUF_SIZE];
+       struct convert_to_gray8_result gray8_result;
        struct convert_to_rgb332_result rgb332_result;
        struct convert_to_rgb565_result rgb565_result;
        struct convert_to_rgb888_result rgb888_result;
                .pitch = 1 * 4,
                .clip = DRM_RECT_INIT(0, 0, 1, 1),
                .xrgb8888 = { 0x01FF0000 },
+               .gray8_result = {
+                       .dst_pitch = 0,
+                       .expected = { 0x4C },
+               },
                .rgb332_result = {
                        .dst_pitch = 0,
                        .expected = { 0xE0 },
                        0x00000000, 0x00000000,
                        0x00000000, 0x10FF0000,
                },
+               .gray8_result = {
+                       .dst_pitch = 0,
+                       .expected = { 0x4C },
+               },
                .rgb332_result = {
                        .dst_pitch = 0,
                        .expected = { 0xE0 },
                        0x00000000, 0x550000FF, 0x66FF00FF, 0x00000000,
                        0x00000000, 0x77FFFF00, 0x8800FFFF, 0x00000000,
                },
+               .gray8_result = {
+                       .dst_pitch = 0,
+                       .expected = {
+                               0xFF, 0x00,
+                               0x4C, 0x99,
+                               0x19, 0x66,
+                               0xE5, 0xB2,
+                       },
+               },
                .rgb332_result = {
                        .dst_pitch = 0,
                        .expected = {
                        0xD16C7073, 0xA20E449C, 0xB2114D05,
                        0xC2A80303, 0xD26C7073, 0xA30E449C,
                },
+               .gray8_result = {
+                       .dst_pitch = 5,
+                       .expected = {
+                               0x3C, 0x33, 0x34, 0x00, 0x00,
+                               0x6F, 0x3C, 0x33, 0x00, 0x00,
+                               0x34, 0x6F, 0x3C, 0x00, 0x00,
+                       },
+               },
                .rgb332_result = {
                        .dst_pitch = 5,
                        .expected = {
 KUNIT_ARRAY_PARAM(convert_xrgb8888, convert_xrgb8888_cases,
                  convert_xrgb8888_case_desc);
 
+static void drm_test_fb_xrgb8888_to_gray8(struct kunit *test)
+{
+       const struct convert_xrgb8888_case *params = test->param_value;
+       const struct convert_to_gray8_result *result = ¶ms->gray8_result;
+       size_t dst_size;
+       __u8 *buf = NULL;
+       __u32 *xrgb8888 = NULL;
+       struct iosys_map dst, src;
+
+       struct drm_framebuffer fb = {
+               .format = drm_format_info(DRM_FORMAT_XRGB8888),
+               .pitches = { params->pitch, 0, 0 },
+       };
+
+       dst_size = conversion_buf_size(DRM_FORMAT_R8, result->dst_pitch,
+                                      ¶ms->clip);
+       KUNIT_ASSERT_GT(test, dst_size, 0);
+
+       buf = kunit_kzalloc(test, dst_size, GFP_KERNEL);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);
+       iosys_map_set_vaddr(&dst, buf);
+
+       xrgb8888 = le32buf_to_cpu(test, params->xrgb8888, TEST_BUF_SIZE);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xrgb8888);
+       iosys_map_set_vaddr(&src, xrgb8888);
+
+       drm_fb_xrgb8888_to_gray8(&dst, &result->dst_pitch, &src, &fb, ¶ms->clip);
+       KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
+}
+
 static void drm_test_fb_xrgb8888_to_rgb332(struct kunit *test)
 {
        const struct convert_xrgb8888_case *params = test->param_value;
 }
 
 static struct kunit_case drm_format_helper_test_cases[] = {
+       KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_gray8, convert_xrgb8888_gen_params),
        KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_rgb332, convert_xrgb8888_gen_params),
        KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_rgb565, convert_xrgb8888_gen_params),
        KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_rgb888, convert_xrgb8888_gen_params),