From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [PATCH i-g-t 34/37] tests/kms_ccs: Correctly check clear color for fp16 formats
Date: Wed, 3 Jul 2024 02:28:14 +0300 [thread overview]
Message-ID: <20240702232817.31147-35-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240702232817.31147-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The hardware generated clear color will be in the native
pixel format. Generate the reference correctly for fp16
formats.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
tests/intel/kms_ccs.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/intel/kms_ccs.c b/tests/intel/kms_ccs.c
index 4c1c78ee4e58..5c18868a062f 100644
--- a/tests/intel/kms_ccs.c
+++ b/tests/intel/kms_ccs.c
@@ -35,6 +35,7 @@
*/
#include "igt.h"
+#include "igt_halffloat.h"
#include "i915/gem_create.h"
#include "intel_pat.h"
@@ -198,6 +199,7 @@ static const uint32_t formats[] = {
DRM_FORMAT_XYUV8888,
DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB2101010,
+ DRM_FORMAT_XBGR16161616F,
DRM_FORMAT_YUYV,
DRM_FORMAT_NV12,
DRM_FORMAT_P012,
@@ -321,7 +323,8 @@ static void check_ccs_cc_plane(int drm_fd, igt_fb_t *fb, int plane, const float
uint32_t d;
} *cc_p;
void *map;
- uint32_t native_color = 0;
+ uint32_t native_color[2] = {};
+ uint16_t half[4];
if (is_i915_device(drm_fd)) {
gem_set_domain(drm_fd, fb->gem_handle, I915_GEM_DOMAIN_CPU, 0);
@@ -338,25 +341,32 @@ static void check_ccs_cc_plane(int drm_fd, igt_fb_t *fb, int plane, const float
switch (fb->drm_format) {
case DRM_FORMAT_XRGB8888:
- native_color = (uint32_t)(cc_color[3] * 0xff) << 24 |
+ native_color[0] = (uint32_t)(cc_color[3] * 0xff) << 24 |
(uint32_t)(cc_color[0] * 0xff) << 16 |
(uint32_t)(cc_color[1] * 0xff) << 8 |
(uint32_t)(cc_color[2] * 0xff);
break;
case DRM_FORMAT_XRGB2101010:
- native_color = (uint32_t)(cc_color[3] * 0x3) << 30 |
+ native_color[0] = (uint32_t)(cc_color[3] * 0x3) << 30 |
(uint32_t)(cc_color[0] * 0x3ff) << 20 |
(uint32_t)(cc_color[1] * 0x3ff) << 10 |
(uint32_t)(cc_color[2] * 0x3ff);
break;
+ case DRM_FORMAT_XBGR16161616F:
+ igt_float_to_half(cc_color, half, 4);
+
+ native_color[1] = (uint64_t)half[3] << 16 | (uint64_t)half[2];
+ native_color[0] = (uint64_t)half[1] << 16 | (uint64_t)half[0];
+ break;
default:
break;
}
- igt_assert(native_color == cc_p[4].d);
+ igt_assert(native_color[0] == cc_p[4].d);
+ igt_assert(native_color[1] == cc_p[5].d);
igt_assert(gem_munmap(map, fb->size) == 0);
-};
+}
static void check_all_ccs_planes(int drm_fd, igt_fb_t *fb, const float *cc_color, bool check_cc_plane)
{
@@ -857,7 +867,8 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags,
if (igt_fb_is_gen12_rc_ccs_cc_modifier(data->ccs_modifier) &&
data->format != DRM_FORMAT_XRGB8888 &&
- data->format != DRM_FORMAT_XRGB2101010)
+ data->format != DRM_FORMAT_XRGB2101010 &&
+ data->format != DRM_FORMAT_XBGR16161616F)
return false;
if ((fb_flags & FB_MISALIGN_AUX_STRIDE) ||
--
2.44.2
next prev parent reply other threads:[~2024-07-02 23:29 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 23:27 [PATCH i-g-t 00/37] Intel CCS + 10bpc/fp16 stuff Ville Syrjala
2024-07-02 23:27 ` [PATCH i-g-t 01/37] lib/intel_aux_pgtable: Library to add support for RGB16161616_64B format Ville Syrjala
2024-08-27 15:16 ` Juha-Pekka Heikkila
2024-08-28 13:03 ` Ville Syrjälä
2024-07-02 23:27 ` [PATCH i-g-t 02/37] lib/rendercopy: Add deltas to all surface relocs Ville Syrjala
2024-07-02 23:27 ` [PATCH i-g-t 03/37] tests/kms_big_fb: Use igt_fb_create_intel_buf() Ville Syrjala
2024-07-02 23:27 ` [PATCH i-g-t 04/37] tests/kms_frontbuffer_tracking: Use igt_create_fb() Ville Syrjala
2024-08-27 15:17 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 05/37] lib/igt_fb: Make igt_calc_fb_size() somewhat usable Ville Syrjala
2024-07-02 23:27 ` [PATCH i-g-t 06/37] lib/rendercopy: Always setup clear color for TGL Ville Syrjala
2024-07-02 23:27 ` [PATCH i-g-t 07/37] lib/rendercopy: Don't skip clearcolor on flat CCS Ville Syrjala
2024-08-27 15:16 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 08/37] lib/rendercopy: Fix fastclear scaling Ville Syrjala
2024-08-27 15:17 ` Juha-Pekka Heikkila
2024-08-29 15:11 ` Ville Syrjälä
2024-07-02 23:27 ` [PATCH i-g-t 09/37] lib/rendercopy: Extract gen4_surface_format() Ville Syrjala
2024-08-27 15:22 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 10/37] lib/rendercopy: Extract {dg2, lnl}_compression_format() Ville Syrjala
2024-08-27 15:24 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 11/37] lib/rendercopy: Add specific support for 2:10:10:10 formats Ville Syrjala
2024-08-27 16:03 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 12/37] lib/rendercopy: Use the proper compression format for 10bpc on dg2/lnl+ Ville Syrjala
2024-08-27 16:04 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 13/37] lib/rendercopy: Use the proper compression format for 16bpc " Ville Syrjala
2024-08-27 16:25 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 14/37] lib/igt_fb: Extract is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-08-27 16:26 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 15/37] lib/igt_fb: Extract ccs_needs_enginecopy() Ville Syrjala
2024-08-27 16:34 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 16/37] lib/igt_fb: Require enginecopy for clear color Ville Syrjala
2024-08-27 16:37 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 17/37] lib/igt_fb: Expose igt_fb_is_ccs_modifier() Ville Syrjala
2024-08-27 16:43 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 18/37] lib/igt_fb: Expose igt_fb_is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-08-27 16:45 ` Juha-Pekka Heikkila
2024-07-02 23:27 ` [PATCH i-g-t 19/37] lib/igt_fb: Expose igt_fb_is_gen12_mc_ccs_modifier() Ville Syrjala
2024-08-27 16:46 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 20/37] lib/igt_fb: Adjust how we pick the blitter compression format Ville Syrjala
2024-08-27 16:50 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 21/37] lib/igt_fb: Add DRM_FORMAT_XRGB2101010 compression format for the Ville Syrjala
2024-08-27 16:52 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 22/37] lib/igt_fb: Add 16bpc compression format for the blitter Ville Syrjala
2024-08-27 16:53 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 23/37] lib/igt_fb: Fix planar block copy Ville Syrjala
2024-08-27 16:55 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 24/37] lib/igt_fb: Fix blitter compression format handling Ville Syrjala
2024-08-27 17:00 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 25/37] lib/igt_fb: Try to fix block copy media compression handling Ville Syrjala
2024-08-27 17:04 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 26/37] lib/igt_fb: Assert that we have no clear color when using the bltter Ville Syrjala
2024-08-27 17:09 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 27/37] lib/vebox: Add support for fp16 RGB formats Ville Syrjala
2024-08-27 17:20 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 28/37] lib/vebox: Add 10bpc support Ville Syrjala
2024-08-27 17:39 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 29/37] lib/igt_fb: Treat 2:10:10:10 properly Ville Syrjala
2024-08-27 17:41 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 30/37] tests/kms_plane: Extract skip_format_mod() Ville Syrjala
2024-08-27 17:44 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 31/37] tests/kms_plane: Skip 10bpc formats with media compression Ville Syrjala
2024-08-27 17:46 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 32/37] tests/kms_ccs: Reuse igt_fb_is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-08-27 17:47 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 33/37] tests/kms_ccs: Correctly check clear color for 10bpc formats Ville Syrjala
2024-08-27 17:48 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` Ville Syrjala [this message]
2024-07-02 23:28 ` [PATCH i-g-t 35/37] tests/kms_ccs: Skip 10bpc formats with media compression Ville Syrjala
2024-07-02 23:28 ` [PATCH i-g-t 36/37] tests/kms_ccs: Skip testing on identical plane types Ville Syrjala
2024-08-27 17:50 ` Juha-Pekka Heikkila
2024-07-02 23:28 ` [PATCH i-g-t 37/37] tests/kms_ccs: Provide a hint as to what we're testing Ville Syrjala
2024-08-27 17:51 ` Juha-Pekka Heikkila
2024-07-03 12:55 ` ✓ CI.xeBAT: success for Intel CCS + 10bpc/fp16 stuff Patchwork
2024-07-03 13:10 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-07-03 13:17 ` Ville Syrjälä
2024-07-03 15:31 ` ✓ CI.xeFULL: success " Patchwork
2024-07-05 16:38 ` ✓ Fi.CI.BAT: success for Intel CCS + 10bpc/fp16 stuff (rev2) Patchwork
2024-07-05 16:43 ` ✓ CI.xeBAT: " Patchwork
2024-07-05 20:04 ` ✓ CI.xeFULL: " Patchwork
2024-07-06 19:07 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-07-13 13:29 ` ✓ CI.xeBAT: success for Intel CCS + 10bpc/fp16 stuff (rev3) Patchwork
2024-07-13 13:39 ` ✓ Fi.CI.BAT: " Patchwork
2024-07-13 14:22 ` ✗ CI.xeFULL: failure " Patchwork
2024-07-15 7:46 ` ✓ Fi.CI.IGT: success " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702232817.31147-35-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox