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 15/23] lib/igt_fb: Expose igt_fb_is_gen12_mc_ccs_modifier()
Date: Mon, 2 Sep 2024 17:37:50 +0300 [thread overview]
Message-ID: <20240902143758.21036-16-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240902143758.21036-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
I'm going to need is_gen12_mc_ccs_modifier() outside of
igt_fb.c. Rename it to igt_fb_is_gen12_mc_ccs_modifier()
and expose it to everyone.
v2: Add docs (J-P)
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/igt_fb.c | 18 ++++++++++++------
lib/igt_fb.h | 1 +
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 534ed9aa4e55..dbf9b1035cfd 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -589,7 +589,13 @@ void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp,
}
}
-static bool is_gen12_mc_ccs_modifier(uint64_t modifier)
+/**
+ * igt_fb_is_gen12_mc_ccs_modifier:
+ * @modifier: drm modifier
+ *
+ * This function returns true if @modifier supports media compression.
+ */
+bool igt_fb_is_gen12_mc_ccs_modifier(uint64_t modifier)
{
return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
@@ -611,7 +617,7 @@ bool igt_fb_is_gen12_rc_ccs_cc_modifier(uint64_t modifier)
static bool is_gen12_ccs_modifier(uint64_t modifier)
{
- return is_gen12_mc_ccs_modifier(modifier) ||
+ return igt_fb_is_gen12_mc_ccs_modifier(modifier) ||
igt_fb_is_gen12_rc_ccs_cc_modifier(modifier) ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
@@ -2518,7 +2524,7 @@ static bool ccs_needs_enginecopy(const struct igt_fb *fb)
if (igt_fb_is_gen12_rc_ccs_cc_modifier(fb->modifier))
return true;
- if (is_gen12_mc_ccs_modifier(fb->modifier))
+ if (igt_fb_is_gen12_mc_ccs_modifier(fb->modifier))
return true;
if (igt_fb_is_ccs_modifier(fb->modifier) &&
@@ -2652,7 +2658,7 @@ igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
} else
igt_assert_eq(fb->strides[1] & 127, 0);
- if (is_gen12_mc_ccs_modifier(fb->modifier))
+ if (igt_fb_is_gen12_mc_ccs_modifier(fb->modifier))
compression = I915_COMPRESSION_MEDIA;
else
compression = I915_COMPRESSION_RENDER;
@@ -2746,7 +2752,7 @@ static bool use_vebox_copy(const struct igt_fb *src_fb,
const struct igt_fb *dst_fb)
{
- return is_gen12_mc_ccs_modifier(dst_fb->modifier) ||
+ return igt_fb_is_gen12_mc_ccs_modifier(dst_fb->modifier) ||
igt_format_is_yuv(src_fb->drm_format) ||
igt_format_is_yuv(dst_fb->drm_format);
}
@@ -2821,7 +2827,7 @@ static struct blt_copy_object *allocate_and_initialize_blt(const struct igt_fb *
intel_get_pat_idx_uc(fb->fd),
blt_tile,
igt_fb_is_ccs_modifier(fb->modifier) ? COMPRESSION_ENABLED : COMPRESSION_DISABLED,
- is_gen12_mc_ccs_modifier(fb->modifier) ? COMPRESSION_TYPE_MEDIA : COMPRESSION_TYPE_3D);
+ igt_fb_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);
blt->plane_offset = fb->offsets[plane];
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 12c9574827f2..eb707cc34560 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -183,6 +183,7 @@ uint64_t igt_fb_tiling_to_mod(uint64_t tiling);
bool igt_fb_is_ccs_modifier(uint64_t modifier);
bool igt_fb_is_gen12_rc_ccs_cc_modifier(uint64_t modifier);
+bool igt_fb_is_gen12_mc_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-09-02 14:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 14:37 [PATCH i-g-t 00/23] Intel format/modifier stuff Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 01/23] lib/rendercopy: Add deltas to all surface relocs Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 02/23] tests/kms_big_fb: Use igt_fb_create_intel_buf() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 03/23] tests/kms_frontbuffer_tracking: Use igt_create_fb() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 04/23] lib/igt_fb: Make igt_calc_fb_size() somewhat usable Ville Syrjala
2024-09-06 13:13 ` Juha-Pekka Heikkila
2024-09-02 14:37 ` [PATCH i-g-t 05/23] lib/rendercopy: Always setup clear color for TGL Ville Syrjala
2024-09-06 13:09 ` Juha-Pekka Heikkila
2024-09-06 13:45 ` Ville Syrjälä
2024-09-07 8:26 ` Juha-Pekka Heikkila
2024-09-12 11:34 ` Ville Syrjälä
2024-09-02 14:37 ` [PATCH i-g-t 06/23] lib/rendercopy: Don't skip clearcolor on flat CCS Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 07/23] lib/rendercopy: Fix fastclear scaling Ville Syrjala
2024-09-06 13:09 ` Juha-Pekka Heikkila
2024-09-02 14:37 ` [PATCH i-g-t 08/23] lib/rendercopy: Extract gen4_surface_format() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 09/23] lib/rendercopy: Extract {dg2, lnl}_compression_format() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 10/23] lib/igt_fb: Extract is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 11/23] lib/igt_fb: Extract ccs_needs_enginecopy() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 12/23] lib/igt_fb: Require enginecopy for clear color Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 13/23] lib/igt_fb: Expose igt_fb_is_ccs_modifier() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 14/23] lib/igt_fb: Expose igt_fb_is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-09-02 14:37 ` Ville Syrjala [this message]
2024-09-02 14:37 ` [PATCH i-g-t 16/23] lib/igt_fb: Adjust how we pick the blitter compression format Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 17/23] lib/igt_fb: Fix planar block copy Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 18/23] lib/igt_fb: Fix blitter compression format handling Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 19/23] lib/igt_fb: Assert that we have no clear color when using the bltter Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 20/23] tests/kms_plane: Extract skip_format_mod() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 21/23] tests/kms_ccs: Reuse igt_fb_is_gen12_rc_ccs_cc_modifier() Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 22/23] tests/kms_ccs: Skip testing on identical plane types Ville Syrjala
2024-09-02 14:37 ` [PATCH i-g-t 23/23] tests/kms_ccs: Provide a hint as to what we're testing Ville Syrjala
2024-09-02 20:17 ` ✓ Fi.CI.BAT: success for Intel format/modifier stuff Patchwork
2024-09-02 20:49 ` ✓ CI.xeBAT: " Patchwork
2024-09-03 4:07 ` ✗ CI.xeFULL: failure " Patchwork
2024-09-04 8:39 ` ✗ 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=20240902143758.21036-16-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