From patchwork Fri Oct 13 14:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F479CDB482 for ; Fri, 13 Oct 2023 14:43:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 16B2110E5E0; Fri, 13 Oct 2023 14:43:43 +0000 (UTC) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by gabe.freedesktop.org (Postfix) with ESMTPS id D09AA10E16B for ; Fri, 13 Oct 2023 14:43:24 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by baptiste.telenet-ops.be with bizsmtp id xSjN2A00Z56FAx301SjN9S; Fri, 13 Oct 2023 16:43:22 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwd-Cz; Fri, 13 Oct 2023 16:43:17 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpC-Qr; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 1/9] util: improve SMPTE color LUT accuracy Date: Fri, 13 Oct 2023 16:43:03 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fill in the LSB when converting color components from 8-bit to 16-bit. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - No changes, v3: - Add Acked-by, v2: - New. --- tests/util/pattern.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/util/pattern.c b/tests/util/pattern.c index bd0989e6dbc6aa27..7d4f6610015e7464 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -646,9 +646,9 @@ void util_smpte_c8_gamma(unsigned size, struct drm_color_lut *lut) memset(lut, 0, size * sizeof(struct drm_color_lut)); #define FILL_COLOR(idx, r, g, b) \ - lut[idx].red = (r) << 8; \ - lut[idx].green = (g) << 8; \ - lut[idx].blue = (b) << 8 + lut[idx].red = (r) * 0x101; \ + lut[idx].green = (g) * 0x101; \ + lut[idx].blue = (b) * 0x101 FILL_COLOR( 0, 192, 192, 192); /* grey */ FILL_COLOR( 1, 192, 192, 0 ); /* yellow */ From patchwork Fri Oct 13 14:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65BFFCDB47E for ; Fri, 13 Oct 2023 14:43:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6718410E192; Fri, 13 Oct 2023 14:43:26 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55CDD10E184 for ; Fri, 13 Oct 2023 14:43:24 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by albert.telenet-ops.be with bizsmtp id xSjN2A00N56FAx306SjN9s; Fri, 13 Oct 2023 16:43:22 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwg-Dl; Fri, 13 Oct 2023 16:43:17 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpG-Rh; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 2/9] util: factor out and optimize C8 SMPTE color LUT Date: Fri, 13 Oct 2023 16:43:04 +0200 Message-Id: <94ea20a1864a6d122eda27066d774e6d353db1e9.1697207862.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The color LUT for the SMPTE pattern in indexed mode contains 22 entries, although only 13 are non-unique. Reduce the size of the color LUT by dropping duplicate entries, so it can be reused for formats supporting e.g. 16 colors. Rename the function util_smpte_c8_gamma() to util_smpte_fill_lut(), and its first parameter size to ncolors, to match their actual use. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - Rename util_smpte_index_gamma() to util_smpte_fill_lut(), and its first parameter from size to ncolors, - Move smpte_color_lut[] down, - Kill FILL_COLOR() macro, - Add and use EXPAND_COLOR() macro, v3: - Add Acked-by, v2: - Factor out smpte color LUT. --- tests/modetest/modetest.c | 2 +- tests/util/pattern.c | 122 +++++++++++++++++++++++++------------- tests/util/pattern.h | 2 +- 3 files changed, 82 insertions(+), 44 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 861a06ebb27bd170..9504fbd8af59ff21 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1155,7 +1155,7 @@ static void set_gamma(struct device *dev, unsigned crtc_id, unsigned fourcc) if (fourcc == DRM_FORMAT_C8) { /* TODO: Add C8 support for more patterns */ - util_smpte_c8_gamma(256, gamma_lut); + util_smpte_fill_lut(256, gamma_lut); drmModeCreatePropertyBlob(dev->fd, gamma_lut, sizeof(gamma_lut), &blob_id); } else { /* diff --git a/tests/util/pattern.c b/tests/util/pattern.c index 7d4f6610015e7464..fc457c4ac61e404a 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -605,6 +605,73 @@ static void fill_smpte_rgb16fp(const struct util_rgb_info *rgb, void *mem, } } +enum smpte_colors { + SMPTE_COLOR_GREY, + SMPTE_COLOR_YELLOW, + SMPTE_COLOR_CYAN, + SMPTE_COLOR_GREEN, + SMPTE_COLOR_MAGENTA, + SMPTE_COLOR_RED, + SMPTE_COLOR_BLUE, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_IN_PHASE, + SMPTE_COLOR_SUPER_WHITE, + SMPTE_COLOR_QUADRATURE, + SMPTE_COLOR_3PC5, + SMPTE_COLOR_11PC5, +}; + +static unsigned int smpte_top[7] = { + SMPTE_COLOR_GREY, + SMPTE_COLOR_YELLOW, + SMPTE_COLOR_CYAN, + SMPTE_COLOR_GREEN, + SMPTE_COLOR_MAGENTA, + SMPTE_COLOR_RED, + SMPTE_COLOR_BLUE, +}; + +static unsigned int smpte_middle[7] = { + SMPTE_COLOR_BLUE, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_MAGENTA, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_CYAN, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_GREY, +}; + +static unsigned int smpte_bottom[8] = { + SMPTE_COLOR_IN_PHASE, + SMPTE_COLOR_SUPER_WHITE, + SMPTE_COLOR_QUADRATURE, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_3PC5, + SMPTE_COLOR_BLACK, + SMPTE_COLOR_11PC5, + SMPTE_COLOR_BLACK, +}; + +#define EXPAND_COLOR(r, g, b) { (r) * 0x101, (g) * 0x101, (b) * 0x101 } + +static const struct drm_color_lut smpte_color_lut[] = { + [SMPTE_COLOR_GREY] = EXPAND_COLOR(192, 192, 192), + [SMPTE_COLOR_YELLOW] = EXPAND_COLOR(192, 192, 0), + [SMPTE_COLOR_CYAN] = EXPAND_COLOR( 0, 192, 192), + [SMPTE_COLOR_GREEN] = EXPAND_COLOR( 0, 192, 0), + [SMPTE_COLOR_MAGENTA] = EXPAND_COLOR(192, 0, 192), + [SMPTE_COLOR_RED] = EXPAND_COLOR(192, 0, 0), + [SMPTE_COLOR_BLUE] = EXPAND_COLOR( 0, 0, 192), + [SMPTE_COLOR_BLACK] = EXPAND_COLOR( 19, 19, 19), + [SMPTE_COLOR_IN_PHASE] = EXPAND_COLOR( 0, 33, 76), + [SMPTE_COLOR_SUPER_WHITE] = EXPAND_COLOR(255, 255, 255), + [SMPTE_COLOR_QUADRATURE] = EXPAND_COLOR( 50, 0, 106), + [SMPTE_COLOR_3PC5] = EXPAND_COLOR( 9, 9, 9), + [SMPTE_COLOR_11PC5] = EXPAND_COLOR( 29, 29, 29), +}; + +#undef EXPAND_COLOR + static void fill_smpte_c8(void *mem, unsigned int width, unsigned int height, unsigned int stride) { @@ -613,69 +680,40 @@ static void fill_smpte_c8(void *mem, unsigned int width, unsigned int height, for (y = 0; y < height * 6 / 9; ++y) { for (x = 0; x < width; ++x) - ((uint8_t *)mem)[x] = x * 7 / width; + ((uint8_t *)mem)[x] = smpte_top[x * 7 / width]; mem += stride; } for (; y < height * 7 / 9; ++y) { for (x = 0; x < width; ++x) - ((uint8_t *)mem)[x] = 7 + (x * 7 / width); + ((uint8_t *)mem)[x] = smpte_middle[x * 7 / width]; mem += stride; } for (; y < height; ++y) { for (x = 0; x < width * 5 / 7; ++x) ((uint8_t *)mem)[x] = - 14 + (x * 4 / (width * 5 / 7)); + smpte_bottom[x * 4 / (width * 5 / 7)]; for (; x < width * 6 / 7; ++x) ((uint8_t *)mem)[x] = - 14 + ((x - width * 5 / 7) * 3 - / (width / 7) + 4); + smpte_bottom[(x - width * 5 / 7) * 3 + / (width / 7) + 4]; for (; x < width; ++x) - ((uint8_t *)mem)[x] = 14 + 7; + ((uint8_t *)mem)[x] = smpte_bottom[7]; mem += stride; } } -void util_smpte_c8_gamma(unsigned size, struct drm_color_lut *lut) +void util_smpte_fill_lut(unsigned int ncolors, struct drm_color_lut *lut) { - if (size < 7 + 7 + 8) { - printf("Error: gamma too small: %d < %d\n", size, 7 + 7 + 8); + if (ncolors < ARRAY_SIZE(smpte_color_lut)) { + printf("Error: lut too small: %u < %zu\n", ncolors, + ARRAY_SIZE(smpte_color_lut)); return; } - memset(lut, 0, size * sizeof(struct drm_color_lut)); - -#define FILL_COLOR(idx, r, g, b) \ - lut[idx].red = (r) * 0x101; \ - lut[idx].green = (g) * 0x101; \ - lut[idx].blue = (b) * 0x101 - - FILL_COLOR( 0, 192, 192, 192); /* grey */ - FILL_COLOR( 1, 192, 192, 0 ); /* yellow */ - FILL_COLOR( 2, 0, 192, 192); /* cyan */ - FILL_COLOR( 3, 0, 192, 0 ); /* green */ - FILL_COLOR( 4, 192, 0, 192); /* magenta */ - FILL_COLOR( 5, 192, 0, 0 ); /* red */ - FILL_COLOR( 6, 0, 0, 192); /* blue */ - - FILL_COLOR( 7, 0, 0, 192); /* blue */ - FILL_COLOR( 8, 19, 19, 19 ); /* black */ - FILL_COLOR( 9, 192, 0, 192); /* magenta */ - FILL_COLOR(10, 19, 19, 19 ); /* black */ - FILL_COLOR(11, 0, 192, 192); /* cyan */ - FILL_COLOR(12, 19, 19, 19 ); /* black */ - FILL_COLOR(13, 192, 192, 192); /* grey */ - - FILL_COLOR(14, 0, 33, 76); /* in-phase */ - FILL_COLOR(15, 255, 255, 255); /* super white */ - FILL_COLOR(16, 50, 0, 106); /* quadrature */ - FILL_COLOR(17, 19, 19, 19); /* black */ - FILL_COLOR(18, 9, 9, 9); /* 3.5% */ - FILL_COLOR(19, 19, 19, 19); /* 7.5% */ - FILL_COLOR(20, 29, 29, 29); /* 11.5% */ - FILL_COLOR(21, 19, 19, 19); /* black */ - -#undef FILL_COLOR + memset(lut, 0, ncolors * sizeof(struct drm_color_lut)); + + memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut)); } static void fill_smpte(const struct util_format_info *info, void *planes[3], diff --git a/tests/util/pattern.h b/tests/util/pattern.h index ea38cafdcf27d811..e500aba3b4686c47 100644 --- a/tests/util/pattern.h +++ b/tests/util/pattern.h @@ -39,7 +39,7 @@ void util_fill_pattern(uint32_t format, enum util_fill_pattern pattern, void *planes[3], unsigned int width, unsigned int height, unsigned int stride); -void util_smpte_c8_gamma(unsigned size, struct drm_color_lut *lut); +void util_smpte_fill_lut(unsigned int ncolors, struct drm_color_lut *lut); enum util_fill_pattern util_pattern_enum(const char *name); From patchwork Fri Oct 13 14:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420974 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1DC7BCDB47E for ; Fri, 13 Oct 2023 14:43:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C8A310E141; Fri, 13 Oct 2023 14:43:22 +0000 (UTC) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AAB910E141 for ; Fri, 13 Oct 2023 14:43:20 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by laurent.telenet-ops.be with bizsmtp id xSjJ2A00156FAx301SjJta; Fri, 13 Oct 2023 16:43:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwk-En; Fri, 13 Oct 2023 16:43:17 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpK-SW; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 3/9] util: add support for DRM_FORMAT_C[124] Date: Fri, 13 Oct 2023 16:43:05 +0200 Message-Id: <4cb4b414602a83c8a3bc5e09fab8ff9cb2972dab.1697207862.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for creating buffers using the new color-indexed frame buffer formats with two, four, and sixteen colors. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - No changes, v3: - Add Acked-by, v2: - Split off changes to tests/util/format.c. --- tests/util/format.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/util/format.c b/tests/util/format.c index f825027227ddba24..b3d2abdc8e67eed0 100644 --- a/tests/util/format.c +++ b/tests/util/format.c @@ -40,6 +40,9 @@ static const struct util_format_info format_info[] = { /* Indexed */ + { DRM_FORMAT_C1, "C1" }, + { DRM_FORMAT_C2, "C2" }, + { DRM_FORMAT_C4, "C4" }, { DRM_FORMAT_C8, "C8" }, /* YUV packed */ { DRM_FORMAT_UYVY, "UYVY", MAKE_YUV_INFO(YUV_YCbCr | YUV_CY, 2, 2, 2) }, From patchwork Fri Oct 13 14:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420980 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07014CDB47E for ; Fri, 13 Oct 2023 14:43:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F2BD10E196; Fri, 13 Oct 2023 14:43:40 +0000 (UTC) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B74210E16B for ; Fri, 13 Oct 2023 14:43:20 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by laurent.telenet-ops.be with bizsmtp id xSjJ2A00456FAx301SjJtb; Fri, 13 Oct 2023 16:43:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwq-FT; Fri, 13 Oct 2023 16:43:17 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpO-TR; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 4/9] util: store number of colors for indexed formats Date: Fri, 13 Oct 2023 16:43:06 +0200 Message-Id: <0d330383122825e424fedfc99ddb2cd16ca314dd.1697207862.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Store the number of available colors for color-indexed frame buffer formats in the format_info[] array. This avoids the need of test code for having to use switch statements all the time to obtain the number of colors, or to check if a mode is color-indexed or not. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - No changes, v3: - Add Acked-by, v2: - New. --- tests/util/format.c | 8 ++++---- tests/util/format.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/util/format.c b/tests/util/format.c index b3d2abdc8e67eed0..b99cc9c3599d9237 100644 --- a/tests/util/format.c +++ b/tests/util/format.c @@ -40,10 +40,10 @@ static const struct util_format_info format_info[] = { /* Indexed */ - { DRM_FORMAT_C1, "C1" }, - { DRM_FORMAT_C2, "C2" }, - { DRM_FORMAT_C4, "C4" }, - { DRM_FORMAT_C8, "C8" }, + { DRM_FORMAT_C1, "C1", .ncolors = 2 }, + { DRM_FORMAT_C2, "C2", .ncolors = 4 }, + { DRM_FORMAT_C4, "C4", .ncolors = 16 }, + { DRM_FORMAT_C8, "C8", .ncolors = 256 }, /* YUV packed */ { DRM_FORMAT_UYVY, "UYVY", MAKE_YUV_INFO(YUV_YCbCr | YUV_CY, 2, 2, 2) }, { DRM_FORMAT_VYUY, "VYUY", MAKE_YUV_INFO(YUV_YCrCb | YUV_CY, 2, 2, 2) }, diff --git a/tests/util/format.h b/tests/util/format.h index 2ce1c021fd78d51d..b847c9f2933b3cde 100644 --- a/tests/util/format.h +++ b/tests/util/format.h @@ -55,6 +55,7 @@ struct util_yuv_info { struct util_format_info { uint32_t format; const char *name; + unsigned int ncolors; const struct util_rgb_info rgb; const struct util_yuv_info yuv; }; From patchwork Fri Oct 13 14:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB23BCDB47E for ; Fri, 13 Oct 2023 14:43:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21C6710E184; Fri, 13 Oct 2023 14:43:25 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10FCA10E16B for ; Fri, 13 Oct 2023 14:43:22 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by albert.telenet-ops.be with bizsmtp id xSjN2A00L56FAx306SjN9p; Fri, 13 Oct 2023 16:43:22 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwt-GB; Fri, 13 Oct 2023 16:43:17 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpS-UI; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 5/9] util: add SMPTE pattern support for C4 format Date: Fri, 13 Oct 2023 16:43:07 +0200 Message-Id: <0b644e3864c66d90d313a19b15d4ee76c73c3ff3.1697207862.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for drawing the SMPTE pattern in a buffer using the C4 indexed format. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - No changes, v3: - Add Acked-by, v2: - Use new smpte_top[], - Split off changes to tests/util/pattern.c. --- tests/util/pattern.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/util/pattern.c b/tests/util/pattern.c index fc457c4ac61e404a..17074265dc60033c 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -672,6 +672,46 @@ static const struct drm_color_lut smpte_color_lut[] = { #undef EXPAND_COLOR +static void write_pixel_4(uint8_t *mem, unsigned int x, unsigned int pixel) +{ + if (x & 1) + mem[x / 2] = (mem[x / 2] & 0xf0) | (pixel & 0x0f); + else + mem[x / 2] = (mem[x / 2] & 0x0f) | (pixel << 4); +} + +static void fill_smpte_c4(void *mem, unsigned int width, unsigned int height, + unsigned int stride) +{ + unsigned int x; + unsigned int y; + + for (y = 0; y < height * 6 / 9; ++y) { + for (x = 0; x < width; ++x) + write_pixel_4(mem, x, smpte_top[x * 7 / width]); + mem += stride; + } + + for (; y < height * 7 / 9; ++y) { + for (x = 0; x < width; ++x) + write_pixel_4(mem, x, smpte_middle[x * 7 / width]); + mem += stride; + } + + for (; y < height; ++y) { + for (x = 0; x < width * 5 / 7; ++x) + write_pixel_4(mem, x, + smpte_bottom[x * 4 / (width * 5 / 7)]); + for (; x < width * 6 / 7; ++x) + write_pixel_4(mem, x, + smpte_bottom[(x - width * 5 / 7) * 3 / + (width / 7) + 4]); + for (; x < width; ++x) + write_pixel_4(mem, x, smpte_bottom[7]); + mem += stride; + } +} + static void fill_smpte_c8(void *mem, unsigned int width, unsigned int height, unsigned int stride) { @@ -723,6 +763,8 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3], unsigned char *u, *v; switch (info->format) { + case DRM_FORMAT_C4: + return fill_smpte_c4(planes[0], width, height, stride); case DRM_FORMAT_C8: return fill_smpte_c8(planes[0], width, height, stride); case DRM_FORMAT_UYVY: From patchwork Fri Oct 13 14:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 401F8CDB482 for ; Fri, 13 Oct 2023 14:43:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E503110E16B; Fri, 13 Oct 2023 14:43:25 +0000 (UTC) Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19F4F10E184 for ; Fri, 13 Oct 2023 14:43:22 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by michel.telenet-ops.be with bizsmtp id xSjN2A00X56FAx306SjNxt; Fri, 13 Oct 2023 16:43:22 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gwx-Gv; Fri, 13 Oct 2023 16:43:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002VpY-V0; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 6/9] util: add SMPTE pattern support for C1 format Date: Fri, 13 Oct 2023 16:43:08 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for drawing the SMPTE pattern in a buffer using the C1 indexed format. As only two colors are available, the pattern is drawn in black and white, using Floyd-Steinberg dithering[1]. [1] https://en.wikipedia.org/wiki/Floyd%E2%80%93Steinberg_dithering Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- Dithering example at https://drive.google.com/file/d/1waJczErrIaEKRhBCCU1ynxRG8agpo0Xx/view v4: - Replace FILL_COLOR() use by bw_color_lut[], v3: - Add Acked-by, - Add Wikipedia link, v2: New. --- tests/util/pattern.c | 174 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 3 deletions(-) diff --git a/tests/util/pattern.c b/tests/util/pattern.c index 17074265dc60033c..2362555356e0dd71 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -654,6 +654,11 @@ static unsigned int smpte_bottom[8] = { #define EXPAND_COLOR(r, g, b) { (r) * 0x101, (g) * 0x101, (b) * 0x101 } +static const struct drm_color_lut bw_color_lut[] = { + EXPAND_COLOR( 0, 0, 0), /* black */ + EXPAND_COLOR(255, 255, 255), /* white */ +}; + static const struct drm_color_lut smpte_color_lut[] = { [SMPTE_COLOR_GREY] = EXPAND_COLOR(192, 192, 192), [SMPTE_COLOR_YELLOW] = EXPAND_COLOR(192, 192, 0), @@ -672,6 +677,164 @@ static const struct drm_color_lut smpte_color_lut[] = { #undef EXPAND_COLOR +/* + * Floyd-Steinberg dithering + */ + +struct fsd { + unsigned int width; + unsigned int x; + unsigned int i; + int red; + int green; + int blue; + int error[]; +}; + +static struct fsd *fsd_alloc(unsigned int width) +{ + unsigned int n = 3 * (width + 1); + struct fsd *fsd = malloc(sizeof(*fsd) + n * sizeof(fsd->error[0])); + + fsd->width = width; + fsd->x = 0; + fsd->i = 0; + memset(fsd->error, 0, n * sizeof(fsd->error[0])); + + return fsd; +} + +static inline int clamp(int val, int min, int max) +{ + if (val < min) + return min; + if (val > max) + return max; + return val; +} + +static void fsd_dither(struct fsd *fsd, struct drm_color_lut *color) +{ + unsigned int i = fsd->i; + + fsd->red = (int)color->red + (fsd->error[3 * i] + 8) / 16; + fsd->green = (int)color->green + (fsd->error[3 * i + 1] + 8) / 16; + fsd->blue = (int)color->blue + (fsd->error[3 * i + 2] + 8) / 16; + + color->red = clamp(fsd->red, 0, 65535); + color->green = clamp(fsd->green, 0, 65535); + color->blue = clamp(fsd->blue, 0, 65535); +} + +static void fsd_update(struct fsd *fsd, const struct drm_color_lut *actual) +{ + int error_red = fsd->red - (int)actual->red; + int error_green = fsd->green - (int)actual->green; + int error_blue = fsd->blue - (int)actual->blue; + unsigned int width = fsd->width; + unsigned int i = fsd->i, j; + unsigned int n = width + 1; + + /* Distribute errors over neighboring pixels */ + if (fsd->x == width - 1) { + /* Last pixel on this scanline */ + /* South East: initialize to zero */ + fsd->error[3 * i] = 0; + fsd->error[3 * i + 1] = 0; + fsd->error[3 * i + 2] = 0; + } else { + /* East: accumulate error */ + j = (i + 1) % n; + fsd->error[3 * j] += 7 * error_red; + fsd->error[3 * j + 1] += 7 * error_green; + fsd->error[3 * j + 2] += 7 * error_blue; + + /* South East: initial error */ + fsd->error[3 * i] = error_red; + fsd->error[3 * i + 1] = error_green; + fsd->error[3 * i + 2] = error_blue; + } + /* South West: accumulate error */ + j = (i + width - 1) % n; + fsd->error[3 * j] += 3 * error_red; + fsd->error[3 * j + 1] += 3 * error_green; + fsd->error[3 * j + 2] += 3 * error_blue; + + /* South: accumulate error */ + j = (i + width) % n; + fsd->error[3 * j] += 5 * error_red; + fsd->error[3 * j + 1] += 5 * error_green; + fsd->error[3 * j + 2] += 5 * error_blue; + + fsd->x = (fsd->x + 1) % width; + fsd->i = (fsd->i + 1) % n; +} + +static void write_pixel_1(uint8_t *mem, unsigned int x, unsigned int pixel) +{ + unsigned int shift = 7 - (x & 7); + unsigned int mask = 1U << shift; + + mem[x / 8] = (mem[x / 8] & ~mask) | ((pixel << shift) & mask); +} + +static void write_color_1(struct fsd *fsd, uint8_t *mem, unsigned int x, + unsigned int index) +{ + struct drm_color_lut color = smpte_color_lut[index]; + unsigned int pixel; + + fsd_dither(fsd, &color); + + /* ITU BT.601: Y = 0.299 R + 0.587 G + 0.114 B */ + if (3 * color.red + 6 * color.green + color.blue >= 10 * 32768) { + pixel = 1; + color.red = color.green = color.blue = 65535; + } else { + pixel = 0; + color.red = color.green = color.blue = 0; + } + + fsd_update(fsd, &color); + + write_pixel_1(mem, x, pixel); +} + +static void fill_smpte_c1(void *mem, unsigned int width, unsigned int height, + unsigned int stride) +{ + struct fsd *fsd = fsd_alloc(width); + unsigned int x; + unsigned int y; + + for (y = 0; y < height * 6 / 9; ++y) { + for (x = 0; x < width; ++x) + write_color_1(fsd, mem, x, smpte_top[x * 7 / width]); + mem += stride; + } + + for (; y < height * 7 / 9; ++y) { + for (x = 0; x < width; ++x) + write_color_1(fsd, mem, x, smpte_middle[x * 7 / width]); + mem += stride; + } + + for (; y < height; ++y) { + for (x = 0; x < width * 5 / 7; ++x) + write_color_1(fsd, mem, x, + smpte_bottom[x * 4 / (width * 5 / 7)]); + for (; x < width * 6 / 7; ++x) + write_color_1(fsd, mem, x, + smpte_bottom[(x - width * 5 / 7) * 3 / + (width / 7) + 4]); + for (; x < width; ++x) + write_color_1(fsd, mem, x, smpte_bottom[7]); + mem += stride; + } + + free(fsd); +} + static void write_pixel_4(uint8_t *mem, unsigned int x, unsigned int pixel) { if (x & 1) @@ -746,14 +909,17 @@ static void fill_smpte_c8(void *mem, unsigned int width, unsigned int height, void util_smpte_fill_lut(unsigned int ncolors, struct drm_color_lut *lut) { - if (ncolors < ARRAY_SIZE(smpte_color_lut)) { + if (ncolors < ARRAY_SIZE(bw_color_lut)) { printf("Error: lut too small: %u < %zu\n", ncolors, - ARRAY_SIZE(smpte_color_lut)); + ARRAY_SIZE(bw_color_lut)); return; } memset(lut, 0, ncolors * sizeof(struct drm_color_lut)); - memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut)); + if (ncolors < ARRAY_SIZE(smpte_color_lut)) + memcpy(lut, bw_color_lut, sizeof(bw_color_lut)); + else + memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut)); } static void fill_smpte(const struct util_format_info *info, void *planes[3], @@ -763,6 +929,8 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3], unsigned char *u, *v; switch (info->format) { + case DRM_FORMAT_C1: + return fill_smpte_c1(planes[0], width, height, stride); case DRM_FORMAT_C4: return fill_smpte_c4(planes[0], width, height, stride); case DRM_FORMAT_C8: From patchwork Fri Oct 13 14:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36612CDB482 for ; Fri, 13 Oct 2023 14:43:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82A2910E195; Fri, 13 Oct 2023 14:43:26 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AFF410E15B for ; Fri, 13 Oct 2023 14:43:20 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by albert.telenet-ops.be with bizsmtp id xSjJ2A00856FAx306SjJ91; Fri, 13 Oct 2023 16:43:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gx3-Hm; Fri, 13 Oct 2023 16:43:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNl-002Vpd-Vn; Fri, 13 Oct 2023 16:43:17 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 7/9] util: add SMPTE pattern support for C2 format Date: Fri, 13 Oct 2023 16:43:09 +0200 Message-Id: <9b90d5737317474d42acfffe0bb9fcab3c923139.1697207862.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for drawing the SMPTE pattern in a buffer using the C2 indexed format. As only four colors are available, resolution is halved, and the pattern is drawn in a PenTile RG-GB matrix, using Floyd-Steinberg dithering. The magnitude of the green subpixels is reduced, as there are twice as many green subpixels as red or blue subpixels. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- Dithering example at https://drive.google.com/file/d/1g5O8XeacrjrC8rgaVENvR65YeI6QvmtO/view v4: - Replace FILL_COLOR() use by pentile_color_lut[], v3: - Add Acked-by, v2: - New. --- tests/util/pattern.c | 100 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/tests/util/pattern.c b/tests/util/pattern.c index 2362555356e0dd71..f69c5206d96eff02 100644 --- a/tests/util/pattern.c +++ b/tests/util/pattern.c @@ -659,6 +659,14 @@ static const struct drm_color_lut bw_color_lut[] = { EXPAND_COLOR(255, 255, 255), /* white */ }; +static const struct drm_color_lut pentile_color_lut[] = { + /* PenTile RG-GB */ + EXPAND_COLOR( 0, 0, 0), /* black */ + EXPAND_COLOR(255, 0, 0), /* red */ + EXPAND_COLOR( 0, 207, 0), /* green */ + EXPAND_COLOR( 0, 0, 255), /* blue */ +}; + static const struct drm_color_lut smpte_color_lut[] = { [SMPTE_COLOR_GREY] = EXPAND_COLOR(192, 192, 192), [SMPTE_COLOR_YELLOW] = EXPAND_COLOR(192, 192, 0), @@ -835,6 +843,92 @@ static void fill_smpte_c1(void *mem, unsigned int width, unsigned int height, free(fsd); } +static void write_pixel_2(uint8_t *mem, unsigned int x, unsigned int pixel) +{ + unsigned int shift = 6 - 2 * (x & 3); + unsigned int mask = 3U << shift; + + mem[x / 4] = (mem[x / 4] & ~mask) | ((pixel << shift) & mask); +} + +static void write_color_2(struct fsd *fsd, uint8_t *mem, unsigned int stride, + unsigned int x, unsigned int index) +{ + struct drm_color_lut color = smpte_color_lut[index]; + unsigned int r, g, b; + + fsd_dither(fsd, &color); + + if (color.red >= 32768) { + r = 1; + color.red = 65535; + } else { + r = 0; + color.red = 0; + } + if (color.green >= 32768) { + g = 2; + color.green = 65535; + } else { + g = 0; + color.green = 0; + } + if (color.blue >= 32768) { + b = 3; + color.blue = 65535; + } else { + b = 0; + color.blue = 0; + } + + fsd_update(fsd, &color); + + /* Use PenTile RG-GB */ + write_pixel_2(mem, 2 * x, r); + write_pixel_2(mem, 2 * x + 1, g); + write_pixel_2(mem + stride, 2 * x, g); + write_pixel_2(mem + stride, 2 * x + 1, b); +} + +static void fill_smpte_c2(void *mem, unsigned int width, unsigned int height, + unsigned int stride) +{ + struct fsd *fsd = fsd_alloc(width); + unsigned int x; + unsigned int y; + + /* Half resolution for PenTile RG-GB */ + width /= 2; + height /= 2; + + for (y = 0; y < height * 6 / 9; ++y) { + for (x = 0; x < width; ++x) + write_color_2(fsd, mem, stride, x, smpte_top[x * 7 / width]); + mem += 2 * stride; + } + + for (; y < height * 7 / 9; ++y) { + for (x = 0; x < width; ++x) + write_color_2(fsd, mem, stride, x, smpte_middle[x * 7 / width]); + mem += 2 * stride; + } + + for (; y < height; ++y) { + for (x = 0; x < width * 5 / 7; ++x) + write_color_2(fsd, mem, stride, x, + smpte_bottom[x * 4 / (width * 5 / 7)]); + for (; x < width * 6 / 7; ++x) + write_color_2(fsd, mem, stride, x, + smpte_bottom[(x - width * 5 / 7) * 3 / + (width / 7) + 4]); + for (; x < width; ++x) + write_color_2(fsd, mem, stride, x, smpte_bottom[7]); + mem += 2 * stride; + } + + free(fsd); +} + static void write_pixel_4(uint8_t *mem, unsigned int x, unsigned int pixel) { if (x & 1) @@ -916,8 +1010,10 @@ void util_smpte_fill_lut(unsigned int ncolors, struct drm_color_lut *lut) } memset(lut, 0, ncolors * sizeof(struct drm_color_lut)); - if (ncolors < ARRAY_SIZE(smpte_color_lut)) + if (ncolors < ARRAY_SIZE(pentile_color_lut)) memcpy(lut, bw_color_lut, sizeof(bw_color_lut)); + else if (ncolors < ARRAY_SIZE(smpte_color_lut)) + memcpy(lut, pentile_color_lut, sizeof(pentile_color_lut)); else memcpy(lut, smpte_color_lut, sizeof(smpte_color_lut)); } @@ -931,6 +1027,8 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3], switch (info->format) { case DRM_FORMAT_C1: return fill_smpte_c1(planes[0], width, height, stride); + case DRM_FORMAT_C2: + return fill_smpte_c2(planes[0], width, height, stride); case DRM_FORMAT_C4: return fill_smpte_c4(planes[0], width, height, stride); case DRM_FORMAT_C8: From patchwork Fri Oct 13 14:43:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53533CDB47E for ; Fri, 13 Oct 2023 14:43:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0520D10E15B; Fri, 13 Oct 2023 14:43:23 +0000 (UTC) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A45910E05C for ; Fri, 13 Oct 2023 14:43:20 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by laurent.telenet-ops.be with bizsmtp id xSjJ2A00956FAx301SjJtd; Fri, 13 Oct 2023 16:43:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006Gx5-IT; Fri, 13 Oct 2023 16:43:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNm-002Vpi-0M; Fri, 13 Oct 2023 16:43:18 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 8/9] modetest: add support for DRM_FORMAT_C[124] Date: Fri, 13 Oct 2023 16:43:10 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for creating buffers using the new color-indexed frame buffer formats with two, four, and sixteen colors. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - No changes, v3: - Add Acked-by, v2: - Split off changes to tests/modetest/buffers.c. --- tests/modetest/buffers.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/modetest/buffers.c b/tests/modetest/buffers.c index c122fb3fe9429190..65f1cfb32ab9eeae 100644 --- a/tests/modetest/buffers.c +++ b/tests/modetest/buffers.c @@ -124,6 +124,18 @@ bo_create(int fd, unsigned int format, int ret; switch (format) { + case DRM_FORMAT_C1: + bpp = 1; + break; + + case DRM_FORMAT_C2: + bpp = 2; + break; + + case DRM_FORMAT_C4: + bpp = 4; + break; + case DRM_FORMAT_C8: case DRM_FORMAT_NV12: case DRM_FORMAT_NV21: @@ -292,6 +304,9 @@ bo_create(int fd, unsigned int format, planes[2] = virtual + offsets[2]; break; + case DRM_FORMAT_C1: + case DRM_FORMAT_C2: + case DRM_FORMAT_C4: case DRM_FORMAT_C8: case DRM_FORMAT_ARGB4444: case DRM_FORMAT_XRGB4444: From patchwork Fri Oct 13 14:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13420981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 829ABCDB47E for ; Fri, 13 Oct 2023 14:43:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBC1210E610; Fri, 13 Oct 2023 14:43:42 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F02C10E16B for ; Fri, 13 Oct 2023 14:43:24 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f151:5551:1af6:b316]) by albert.telenet-ops.be with bizsmtp id xSjN2A00M56FAx306SjN9r; Fri, 13 Oct 2023 16:43:22 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qrJNi-006GxA-JM; Fri, 13 Oct 2023 16:43:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qrJNm-002Vpn-16; Fri, 13 Oct 2023 16:43:18 +0200 From: Geert Uytterhoeven To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v4 9/9] modetest: add SMPTE pattern support for C[124] formats Date: Fri, 13 Oct 2023 16:43:11 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Geert Uytterhoeven Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for drawing the SMPTE pattern in buffers using a color-indexed frame buffer formats with two, four, or sixteen colors. Note that this still uses 256 as the CLUT size, as DRM_IOCTL_MODE_SETGAMMA enforces that the size matches against the (fixed) gamma size, while the CLUT size depends on the format. Move clearing the color LUT entries from util_smpte_index_gamma() to its caller, as only the caller knows how many entries there really are (currently DRM always assumes 256 entries). Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg --- v4: - Add missing C[12] to oneline-summary, - Do not remove memset() of full lut, else some entries may stay uninitialized, v3: - Add Acked-by, v2: - Split off changes to tests/modetest/modetest.c, - Add C1 and C2 support. The linuxdoc comments say userspace can query the gamma size: * drm_mode_gamma_set_ioctl - set the gamma table * * Set the gamma table of a CRTC to the one passed in by the user. Userspace can * inquire the required gamma table size through drm_mode_gamma_get_ioctl. * drm_mode_gamma_get_ioctl - get the gamma table * * Copy the current gamma table into the storage provided. This also provides * the gamma table size the driver expects, which can be used to size the * allocated storage. but the code doesn't seem to support that in an easy way (like setting red/green/blue to NULL on input, retrieving gamma_size on output), only by providing big enough buffers for red/green/blue, and looping over gamma_size until -EINVAL is no longer returned. --- tests/modetest/modetest.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 9504fbd8af59ff21..9b1aa537be8716cf 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1149,13 +1149,16 @@ static bool add_property_optional(struct device *dev, uint32_t obj_id, static void set_gamma(struct device *dev, unsigned crtc_id, unsigned fourcc) { unsigned blob_id = 0; + const struct util_format_info *info; /* TODO: support 1024-sized LUTs, when the use-case arises */ struct drm_color_lut gamma_lut[256]; int i, ret; - if (fourcc == DRM_FORMAT_C8) { - /* TODO: Add C8 support for more patterns */ - util_smpte_fill_lut(256, gamma_lut); + info = util_format_info_find(fourcc); + if (info->ncolors) { + memset(gamma_lut, 0, sizeof(gamma_lut)); + /* TODO: Add index support for more patterns */ + util_smpte_fill_lut(info->ncolors, gamma_lut); drmModeCreatePropertyBlob(dev->fd, gamma_lut, sizeof(gamma_lut), &blob_id); } else { /*