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
Subject: [PATCH i-g-t v2 17/18] tests/kms_ccs: Try to fix the xe2 blitter compression format
Date: Wed, 18 Sep 2024 15:05:17 +0300	[thread overview]
Message-ID: <20240918120518.30258-18-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>

Pluck the compression format values from the LNL/BMG table.

TODO: or should be we using those stateful/stateless values or
      something? no idea
TODO: Move this into igt_fb.c

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/intel/kms_ccs.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/tests/intel/kms_ccs.c b/tests/intel/kms_ccs.c
index bb18784e6fac..835a3fe5aed2 100644
--- a/tests/intel/kms_ccs.c
+++ b/tests/intel/kms_ccs.c
@@ -651,19 +651,29 @@ static enum blt_color_depth blt_get_bpp(const struct igt_fb *fb,
 }
 
 static uint32_t blt_compression_format(struct blt_copy_data *blt,
-				       const struct igt_fb *fb)
+				       const struct igt_fb *fb,
+				       int color_plane)
 {
-	switch (fb->drm_format) {
-	case DRM_FORMAT_XRGB8888:
+	switch (igt_reduce_format(fb->drm_format)) {
+	case DRM_FORMAT_XRGB16161616F:
+		return 0x7; /* CMF_R16_G16_B16_A16 */
 	case DRM_FORMAT_XRGB2101010:
-	case DRM_FORMAT_P010:
-	case DRM_FORMAT_P012:
-	case DRM_FORMAT_P016:
-	case DRM_FORMAT_YUYV:
-		return 8;
+		return 0x3; /* CMF_R10_G10_B10_A2 */
+	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XYUV8888:
+		return 0x2; /* CMF_R8_G8_B8_A8 */
+	case DRM_FORMAT_YUYV:
+		return 0x1; /* CMF_R8_G8 (treated as 16bpp format) */
 	case DRM_FORMAT_NV12:
-		return 9;
+		if (color_plane)
+			return 0x1; /* CMF_R8_G8 */
+		else
+			return 0x0; /* CMF_R8 */
+	case DRM_FORMAT_P010:
+		if (color_plane)
+			return 0x6; /* CMF_R16_G16 */
+		else
+			return 0x5; /* CMF_R16 */
 	default:
 		igt_assert_f(0, "Unknown format\n");
 	}
@@ -712,12 +722,12 @@ static void xe2_ccs_blit(data_t *data, struct igt_fb *fb, struct igt_fb *temp_fb
 		blt_set_copy_object(&blt.dst, dst);
 
 		blt_set_object_ext(&ext.src,
-				blt_compression_format(&blt, src_fb),
+				blt_compression_format(&blt, src_fb, i),
 				src_fb->plane_width[i], src_fb->plane_height[i],
 				SURFACE_TYPE_2D);
 
 		blt_set_object_ext(&ext.dst,
-				blt_compression_format(&blt, dst_fb),
+				blt_compression_format(&blt, dst_fb, i),
 				dst_fb->plane_width[i], dst_fb->plane_height[i],
 				SURFACE_TYPE_2D);
 
-- 
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 ` [PATCH i-g-t v2 14/18] tests/kms_ccs: Correctly check clear color for 10bpc formats Ville Syrjala
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 ` Ville Syrjala [this message]
2024-09-23 17:28   ` [PATCH i-g-t v2 17/18] tests/kms_ccs: Try to fix the xe2 blitter compression format 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-18-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