[igt-dev] [HAX 1/2] tests/kms_ccs: Larger fb to fully cover up the primary plane

[Dhinakaran Pandiyan]

This is a revert of commit 27fa97d16294 ("tests/kms_ccs: Avoid using plane
sizes which exceed hw capability"). The watermarks issue that the patch
refers to has been fixed as per the bugzilla, so let's use an fb that
covers the whole screen.

Cc: Clinton Taylor <clinton.a.taylor at intel.com>
Cc: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=105458
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
---
 tests/kms_ccs.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index 1ed2b4a0..70e9509d 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -68,15 +68,6 @@ typedef struct {
 #define CCS_UNCOMPRESSED	0x0
 #define CCS_COMPRESSED		0x55
 
-/*
- * Limit maximum used sprite plane width so this test will not mistakenly
- * fail on hardware limitations which are not interesting to this test.
- * On this test too wide sprite plane may fail during creation with dmesg
- * comment saying:
- * "Requested display configuration exceeds system watermark limitations"
- */
-#define MAX_SPRITE_PLANE_WIDTH 2000
-
 struct local_drm_format_modifier {
        /* Bitmask of formats in get_plane format list this info applies to. The
 	* offset allows a sliding window of which 64 formats (bits).
@@ -417,13 +408,12 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags,
 	if (data->plane && fb_flags & FB_COMPRESSED) {
 		if (!plane_has_format_with_ccs(data, data->plane, DRM_FORMAT_XRGB8888))
 			return false;
-		generate_fb(data, &fb, min(MAX_SPRITE_PLANE_WIDTH, drm_mode->hdisplay),
-			    drm_mode->vdisplay,
+		generate_fb(data, &fb, drm_mode->hdisplay, drm_mode->vdisplay,
 			    (fb_flags & ~FB_COMPRESSED) | FB_HAS_PLANE);
 		generate_fb(data, &fb_sprite, 256, 256, fb_flags);
 	} else {
-		generate_fb(data, &fb, min(MAX_SPRITE_PLANE_WIDTH, drm_mode->hdisplay),
-			    drm_mode->vdisplay, fb_flags);
+		generate_fb(data, &fb, drm_mode->hdisplay, drm_mode->vdisplay,
+			    fb_flags);
 	}
 
 	if (data->flags & TEST_FAIL_ON_ADDFB2)
-- 
2.17.1