[PATCH i-g-t 18/23] lib/igt_fb: Fix blitter compression format handling

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

For some reason blt_compression_format() sets up both the
source and destination with the same compression format.
This doesn't make sense to me as one or the other could
at least be uncompressed. Decouple the src vs. dst
compression formats so that they can be set independently.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 lib/igt_fb.c | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 2d53b317afc2..1ec16ab9d813 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -2897,12 +2897,6 @@ static enum blt_color_depth blt_get_bpp(const struct igt_fb *fb,
 	}
 }
 
-#define BLT_TARGET_RC(x) (x.compression == COMPRESSION_ENABLED && \
-			  x.compression_type == COMPRESSION_TYPE_3D)
-
-#define BLT_TARGET_MC(x) (x.compression == COMPRESSION_ENABLED && \
-			  x.compression_type == COMPRESSION_TYPE_MEDIA)
-
 const struct {
 	uint32_t format;
 	enum blt_compression_type type;
@@ -2928,25 +2922,14 @@ static uint32_t get_compression_return_value(uint32_t format,
 	return 0; // This line is to avoid compilation warnings, it will not be reached.
 }
 
-static uint32_t blt_compression_format(struct blt_copy_data *blt,
+static uint32_t blt_compression_format(const struct blt_copy_object *obj,
 				       const struct igt_fb *fb)
 {
-	if (blt->src.compression == COMPRESSION_DISABLED &&
-	    blt->dst.compression == COMPRESSION_DISABLED)
+	if (obj->compression == COMPRESSION_DISABLED)
 		return 0;
 
-	if (BLT_TARGET_RC(blt->src) || BLT_TARGET_RC(blt->dst))
-		return get_compression_return_value(igt_reduce_format(fb->drm_format),
-						    COMPRESSION_TYPE_3D);
-
-	if (BLT_TARGET_MC(blt->src))
-		return get_compression_return_value(igt_reduce_format(fb->drm_format),
-						    COMPRESSION_TYPE_MEDIA);
-
-	if (BLT_TARGET_MC(blt->dst))
-		igt_assert_f(0, "Destination compression not supported on mc ccs\n");
-
-	igt_assert_f(0, "unknown compression\n");
+	return get_compression_return_value(igt_reduce_format(fb->drm_format),
+					    obj->compression_type);
 }
 
 static void setup_context_and_memory_region(const struct igt_fb *fb, uint32_t *ctx,
@@ -3021,6 +3004,10 @@ static void do_block_copy(const struct igt_fb *src_fb,
 
 	igt_assert(src && dst);
 
+	igt_assert_f(blt.dst.compression == COMPRESSION_DISABLED ||
+		     blt.dst.compression_type !=  COMPRESSION_TYPE_MEDIA,
+		     "Destination compression not supported on mc ccs\n");
+
 	blt_copy_init(src_fb->fd, &blt);
 	blt.color_depth = blt_get_bpp(src_fb, i);
 	blt_set_copy_object(&blt.src, src);
@@ -3028,12 +3015,12 @@ static void do_block_copy(const struct igt_fb *src_fb,
 
 	if (blt_uses_extended_block_copy(src_fb->fd)) {
 		blt_set_object_ext(&ext.src,
-				   blt_compression_format(&blt, src_fb),
+				   blt_compression_format(&blt.src, src_fb),
 				   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, dst_fb),
 				   dst_fb->plane_width[i], dst_fb->plane_height[i],
 				   SURFACE_TYPE_2D);
 		pext = &ext;
-- 
2.44.2