From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [PATCH i-g-t 17/37] lib/igt_fb: Expose igt_fb_is_ccs_modifier()
Date: Wed, 3 Jul 2024 02:27:57 +0300 [thread overview]
Message-ID: <20240702232817.31147-18-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>
I'm going to need is_ccs_modifier() outside of igt_fb.c.
Rename it to igt_fb_is_ccs_modifier() and expose it to everyone.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/igt_fb.c | 18 ++++++++++--------
lib/igt_fb.h | 1 +
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 80e3c0a48bda..bcb418e0f7be 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -610,7 +610,7 @@ static bool is_gen12_ccs_modifier(uint64_t modifier)
modifier == I915_FORMAT_MOD_4_TILED_MTL_RC_CCS;
}
-static bool is_ccs_modifier(uint64_t modifier)
+bool igt_fb_is_ccs_modifier(uint64_t modifier)
{
return is_gen12_ccs_modifier(modifier) ||
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
@@ -619,7 +619,8 @@ static bool is_ccs_modifier(uint64_t modifier)
static bool is_ccs_plane(const struct igt_fb *fb, int plane)
{
- if (!is_ccs_modifier(fb->modifier) || HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
+ if (!igt_fb_is_ccs_modifier(fb->modifier) ||
+ HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
return false;
return plane >= fb->num_planes / 2;
@@ -729,7 +730,8 @@ static int fb_num_planes(const struct igt_fb *fb)
{
int num_planes = lookup_drm_format(fb->drm_format)->num_planes;
- if (is_ccs_modifier(fb->modifier) && !HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
+ if (igt_fb_is_ccs_modifier(fb->modifier) &&
+ !HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
num_planes *= 2;
if (fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
@@ -2482,7 +2484,7 @@ static enum blt_tiling_type fb_tile_to_blt_tile(uint64_t tile)
static bool fast_blit_ok(const struct igt_fb *fb)
{
return blt_has_fast_copy(fb->fd) &&
- !is_ccs_modifier(fb->modifier) &&
+ !igt_fb_is_ccs_modifier(fb->modifier) &&
blt_fast_copy_supports_tiling(fb->fd,
fb_tile_to_blt_tile(fb->modifier));
}
@@ -2502,7 +2504,7 @@ static bool ccs_needs_enginecopy(const struct igt_fb *fb)
if (is_gen12_mc_ccs_modifier(fb->modifier))
return true;
- if (is_ccs_modifier(fb->modifier) &&
+ if (igt_fb_is_ccs_modifier(fb->modifier) &&
!HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
return true;
@@ -2622,7 +2624,7 @@ igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
igt_assert_eq(fb->offsets[0], 0);
- if (is_ccs_modifier(fb->modifier)) {
+ if (igt_fb_is_ccs_modifier(fb->modifier)) {
igt_assert_eq(fb->strides[0] & 127, 0);
if (is_gen12_ccs_modifier(fb->modifier)) {
@@ -2666,7 +2668,7 @@ igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
if (buf->format_is_yuv_semiplanar)
buf->yuv_semiplanar_bpp = yuv_semiplanar_bpp(fb->drm_format);
- if (is_ccs_modifier(fb->modifier)) {
+ if (igt_fb_is_ccs_modifier(fb->modifier)) {
num_surfaces = fb->num_planes / (HAS_FLATCCS(intel_get_drm_devid(fb->fd)) ? 1 : 2);
for (i = 0; i < num_surfaces; i++)
init_buf_ccs(buf, i,
@@ -2799,7 +2801,7 @@ static struct blt_copy_object *allocate_and_initialize_blt(const struct igt_fb *
intel_get_uc_mocs_index(fb->fd),
intel_get_pat_idx_uc(fb->fd),
blt_tile,
- is_ccs_modifier(fb->modifier) ? COMPRESSION_ENABLED : COMPRESSION_DISABLED,
+ igt_fb_is_ccs_modifier(fb->modifier) ? COMPRESSION_ENABLED : COMPRESSION_DISABLED,
is_gen12_mc_ccs_modifier(fb->modifier) ? COMPRESSION_TYPE_MEDIA : COMPRESSION_TYPE_3D);
blt_set_geom(blt, stride, 0, 0, fb->width, fb->plane_height[plane], 0, 0);
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 2b5040ce3c6b..b1b40b858610 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -181,6 +181,7 @@ void igt_fb_calc_crc(struct igt_fb *fb, igt_crc_t *crc);
uint64_t igt_fb_mod_to_tiling(uint64_t modifier);
uint64_t igt_fb_tiling_to_mod(uint64_t tiling);
+bool igt_fb_is_ccs_modifier(uint64_t modifier);
bool igt_fb_is_ccs_plane(const struct igt_fb *fb, int plane);
bool igt_fb_is_gen12_ccs_cc_plane(const struct igt_fb *fb, int plane);
int igt_fb_ccs_to_main_plane(const struct igt_fb *fb, int ccs_plane);
--
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 ` Ville Syrjala [this message]
2024-08-27 16:43 ` [PATCH i-g-t 17/37] lib/igt_fb: Expose igt_fb_is_ccs_modifier() 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 ` [PATCH i-g-t 34/37] tests/kms_ccs: Correctly check clear color for fp16 formats Ville Syrjala
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-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