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 13/23] lib/igt_fb: Expose igt_fb_is_ccs_modifier()
Date: Mon, 2 Sep 2024 17:37:48 +0300 [thread overview]
Message-ID: <20240902143758.21036-14-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_ccs_modifier() outside of igt_fb.c.
Rename it to igt_fb_is_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 | 24 ++++++++++++++++--------
lib/igt_fb.h | 1 +
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 776c826c0d55..0cf8691d1d7d 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -612,7 +612,13 @@ 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)
+/**
+ * igt_fb_is_ccs_modifier:
+ * @modifier: drm modifier
+ *
+ * This function returns true if @modifier supports compression.
+ */
+bool igt_fb_is_ccs_modifier(uint64_t modifier)
{
return is_gen12_ccs_modifier(modifier) ||
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
@@ -621,7 +627,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;
@@ -731,7 +738,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 ||
@@ -2489,7 +2497,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));
}
@@ -2509,7 +2517,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;
@@ -2631,7 +2639,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)) {
@@ -2675,7 +2683,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,
@@ -2808,7 +2816,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-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 ` Ville Syrjala [this message]
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 ` [PATCH i-g-t 15/23] lib/igt_fb: Expose igt_fb_is_gen12_mc_ccs_modifier() Ville Syrjala
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-14-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