Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Subject: [PATCH i-g-t v2 14/18] tests/kms_ccs: Correctly check clear color for 10bpc formats
Date: Wed, 18 Sep 2024 15:05:14 +0300	[thread overview]
Message-ID: <20240918120518.30258-15-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240918120518.30258-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 10bpc
formats.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/intel/kms_ccs.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/intel/kms_ccs.c b/tests/intel/kms_ccs.c
index 7cda79412d94..68e925382bd6 100644
--- a/tests/intel/kms_ccs.c
+++ b/tests/intel/kms_ccs.c
@@ -324,7 +324,7 @@ 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;
+	uint32_t native_color = 0;
 
 	if (is_i915_device(drm_fd)) {
 		gem_set_domain(drm_fd, fb->gem_handle, I915_GEM_DOMAIN_CPU, 0);
@@ -339,10 +339,22 @@ static void check_ccs_cc_plane(int drm_fd, igt_fb_t *fb, int plane, const float
 		   cc_color[2] == cc_p[2].f &&
 		   cc_color[3] == cc_p[3].f);
 
-	native_color = (uint8_t)(cc_color[3] * 0xff) << 24 |
-		       (uint8_t)(cc_color[0] * 0xff) << 16 |
-		       (uint8_t)(cc_color[1] * 0xff) << 8 |
-		       (uint8_t)(cc_color[2] * 0xff);
+	switch (fb->drm_format) {
+	case DRM_FORMAT_XRGB8888:
+		native_color = (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 |
+			(uint32_t)(cc_color[0] * 0x3ff) << 20 |
+			(uint32_t)(cc_color[1] * 0x3ff) << 10 |
+			(uint32_t)(cc_color[2] * 0x3ff);
+		break;
+	default:
+		break;
+	}
 
 	igt_assert_eq_u32(native_color, cc_p[4].d);
 
-- 
2.44.2


  parent reply	other threads:[~2024-09-18 12:06 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-18 12:05 [PATCH i-g-t v2 00/18] Intel CCS + 10bpc/fp16 stuff Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 01/18] lib/intel_aux_pgtable: Library to add support for RGB16161616_64B format Ville Syrjala
2024-09-23  9:51   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` [PATCH i-g-t v2 02/18] lib/rendercopy: Add specific support for 2:10:10:10 formats Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 03/18] lib/rendercopy: Use the proper compression format for 10bpc on dg2/lnl+ Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 04/18] lib/rendercopy: Use the proper compression format for 16bpc " Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 05/18] lib/rendercopy: Skip AUX surface setup in TGL+ Ville Syrjala
2024-09-23  9:51   ` Juha-Pekka Heikkila
2024-09-23 20:04     ` Ville Syrjälä
2024-09-18 12:05 ` [PATCH i-g-t v2 06/18] lib/igt_fb: Add 10bpc compression format for the blitter Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 07/18] lib/igt_fb: Add 16bpc " Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 08/18] lib/igt_fb: Try to fix block copy media compression handling Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 09/18] tests/kms_plane: Skip 10bpc formats with media compression Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 10/18] tests/kms_ccs: " Ville Syrjala
2024-09-23  9:52   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` [PATCH i-g-t v2 11/18] lib/igt_fb: Treat 2:10:10:10 properly Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 12/18] lib/vebox: Add support for fp16 RGB formats Ville Syrjala
2024-09-18 12:05 ` [PATCH i-g-t v2 13/18] lib/vebox: Document that 2:10:10:10 is unusable with VEBOX Ville Syrjala
2024-09-23  9:54   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` Ville Syrjala [this message]
2024-09-18 12:05 ` [PATCH i-g-t v2 15/18] tests/kms_ccs: Correctly check clear color for fp16 formats Ville Syrjala
2024-09-23 11:00   ` Juha-Pekka Heikkila
2024-09-23 16:39   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` [PATCH i-g-t v2 16/18] tests/kms_ccs: Fix planar blits for xe2 Ville Syrjala
2024-09-23 16:53   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` [PATCH i-g-t v2 17/18] tests/kms_ccs: Try to fix the xe2 blitter compression format Ville Syrjala
2024-09-23 17:28   ` Juha-Pekka Heikkila
2024-09-18 12:05 ` [PATCH i-g-t v2 18/18] lib/intel_aux_pgtable: Pick a more optimal aux format for 10bpc Ville Syrjala
2024-09-23 17:30   ` Juha-Pekka Heikkila
2024-09-18 13:59 ` ✓ Fi.CI.BAT: success for Intel CCS + 10bpc/fp16 stuff (rev4) Patchwork
2024-09-18 14:40 ` ✓ CI.xeBAT: " Patchwork
2024-09-18 20:53 ` ✗ CI.xeFULL: failure " Patchwork
2024-09-19  4:08 ` ✗ Fi.CI.IGT: " 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=20240918120518.30258-15-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=juhapekka.heikkila@gmail.com \
    /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