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 08/23] lib/rendercopy: Extract gen4_surface_format()
Date: Mon, 2 Sep 2024 17:37:43 +0300 [thread overview]
Message-ID: <20240902143758.21036-9-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>
All the rendercopy implementation can use the same code to
determine the surface format. Extract said code to a helper.
v2: Drop stray newline
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/rendercopy_gen4.c | 9 +--------
lib/rendercopy_gen6.c | 10 +---------
lib/rendercopy_gen7.c | 12 ++----------
lib/rendercopy_gen8.c | 8 +-------
lib/rendercopy_gen9.c | 8 +-------
lib/surfaceformat.h | 16 ++++++++++++++++
6 files changed, 22 insertions(+), 41 deletions(-)
diff --git a/lib/rendercopy_gen4.c b/lib/rendercopy_gen4.c
index 8582e0efb886..b8b7e5ad7e2c 100644
--- a/lib/rendercopy_gen4.c
+++ b/lib/rendercopy_gen4.c
@@ -137,14 +137,7 @@ gen4_bind_buf(struct intel_bb *ibb, const struct intel_buf *buf, int is_dst)
ss = intel_bb_ptr_align(ibb, 32);
ss->ss0.surface_type = SURFACE_2D;
- switch (buf->bpp) {
- case 8: ss->ss0.surface_format = SURFACEFORMAT_R8_UNORM; break;
- case 16: ss->ss0.surface_format = SURFACEFORMAT_R8G8_UNORM; break;
- case 32: ss->ss0.surface_format = SURFACEFORMAT_B8G8R8A8_UNORM; break;
- case 64: ss->ss0.surface_format = SURFACEFORMAT_R16G16B16A16_FLOAT; break;
- default: igt_assert(0);
- }
-
+ ss->ss0.surface_format = gen4_surface_format(buf->bpp);
ss->ss0.data_return_format = SURFACERETURNFORMAT_FLOAT32;
ss->ss0.color_blend = 1;
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index ec197661702f..0c71bd9cbf19 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -79,15 +79,7 @@ gen6_bind_buf(struct intel_bb *ibb, const struct intel_buf *buf, int is_dst)
ss = intel_bb_ptr_align(ibb, 32);
ss->ss0.surface_type = SURFACE_2D;
-
- switch (buf->bpp) {
- case 8: ss->ss0.surface_format = SURFACEFORMAT_R8_UNORM; break;
- case 16: ss->ss0.surface_format = SURFACEFORMAT_R8G8_UNORM; break;
- case 32: ss->ss0.surface_format = SURFACEFORMAT_B8G8R8A8_UNORM; break;
- case 64: ss->ss0.surface_format = SURFACEFORMAT_R16G16B16A16_FLOAT; break;
- default: igt_assert(0);
- }
-
+ ss->ss0.surface_format = gen4_surface_format(buf->bpp);
ss->ss0.data_return_format = SURFACERETURNFORMAT_FLOAT32;
ss->ss0.color_blend = 1;
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index e3657b5d1035..8fcbbc21cdd8 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -57,7 +57,7 @@ gen7_bind_buf(struct intel_bb *ibb,
const struct intel_buf *buf,
int is_dst)
{
- uint32_t format, *ss;
+ uint32_t *ss;
uint32_t write_domain, read_domain;
uint64_t address;
@@ -65,14 +65,6 @@ gen7_bind_buf(struct intel_bb *ibb,
igt_assert_lte(intel_buf_width(buf), 16384);
igt_assert_lte(intel_buf_height(buf), 16384);
- switch (buf->bpp) {
- case 8: format = SURFACEFORMAT_R8_UNORM; break;
- case 16: format = SURFACEFORMAT_R8G8_UNORM; break;
- case 32: format = SURFACEFORMAT_B8G8R8A8_UNORM; break;
- case 64: format = SURFACEFORMAT_R16G16B16A16_FLOAT; break;
- default: igt_assert(0);
- }
-
if (is_dst) {
write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
} else {
@@ -84,7 +76,7 @@ gen7_bind_buf(struct intel_bb *ibb,
ss[0] = (SURFACE_2D << GEN7_SURFACE_TYPE_SHIFT |
gen7_tiling_bits(buf->tiling) |
- format << GEN7_SURFACE_FORMAT_SHIFT);
+ gen4_surface_format(buf->bpp) << GEN7_SURFACE_FORMAT_SHIFT);
address = intel_bb_offset_reloc_with_delta(ibb, buf->handle,
read_domain, write_domain,
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index 23bea56ad1ba..28c703fca393 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -88,13 +88,7 @@ gen8_bind_buf(struct intel_bb *ibb,
ss = intel_bb_ptr_align(ibb, 64);
ss->ss0.surface_type = SURFACE_2D;
- switch (buf->bpp) {
- case 8: ss->ss0.surface_format = SURFACEFORMAT_R8_UNORM; break;
- case 16: ss->ss0.surface_format = SURFACEFORMAT_R8G8_UNORM; break;
- case 32: ss->ss0.surface_format = SURFACEFORMAT_B8G8R8A8_UNORM; break;
- case 64: ss->ss0.surface_format = SURFACEFORMAT_R16G16B16A16_FLOAT; break;
- default: igt_assert(0);
- }
+ ss->ss0.surface_format = gen4_surface_format(buf->bpp);
ss->ss0.render_cache_read_write = 1;
ss->ss0.vertical_alignment = 1; /* align 4 */
ss->ss0.horizontal_alignment = 1; /* align 4 */
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 42a227916f15..11f456a70d2f 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -168,13 +168,7 @@ gen9_bind_buf(struct intel_bb *ibb, const struct intel_buf *buf, int is_dst,
ss = intel_bb_ptr_align(ibb, 64);
ss->ss0.surface_type = SURFACE_2D;
- switch (buf->bpp) {
- case 8: ss->ss0.surface_format = SURFACEFORMAT_R8_UNORM; break;
- case 16: ss->ss0.surface_format = SURFACEFORMAT_R8G8_UNORM; break;
- case 32: ss->ss0.surface_format = SURFACEFORMAT_B8G8R8A8_UNORM; break;
- case 64: ss->ss0.surface_format = SURFACEFORMAT_R16G16B16A16_FLOAT; break;
- default: igt_assert(0);
- }
+ ss->ss0.surface_format = gen4_surface_format(buf->bpp);
ss->ss0.vertical_alignment = 1; /* align 4 */
ss->ss0.horizontal_alignment = 1; /* align 4 or HALIGN_32 on display ver >= 13*/
diff --git a/lib/surfaceformat.h b/lib/surfaceformat.h
index 32ea373262ca..58ef41e6d3cd 100644
--- a/lib/surfaceformat.h
+++ b/lib/surfaceformat.h
@@ -186,4 +186,20 @@
#define SURFACE_MIPMAPLAYOUT_BELOW 0
#define SURFACE_MIPMAPLAYOUT_RIGHT 1
+static inline uint32_t gen4_surface_format(int bpp)
+{
+ switch (bpp) {
+ case 8:
+ return SURFACEFORMAT_R8_UNORM;
+ case 16:
+ return SURFACEFORMAT_R8G8_UNORM;
+ case 32:
+ return SURFACEFORMAT_B8G8R8A8_UNORM;
+ case 64:
+ return SURFACEFORMAT_R16G16B16A16_FLOAT;
+ default:
+ return 0;
+ }
+}
+
#endif
--
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 ` Ville Syrjala [this message]
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 ` [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-9-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