[igt-dev] [PATCH i-g-t 3/8] tools/intel_watermark: Deal with TGL planes

Ville Syrjala ville.syrjala at linux.intel.com
Wed Apr 14 02:27:49 UTC 2021


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

TGL has the same amount of planes as ICL. Make intel_watermark
aware of that fact.

v2: Use intel_gen()

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 tools/intel_watermark.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index 39aaf9fbe055..4a5764b59677 100644
--- a/tools/intel_watermark.c
+++ b/tools/intel_watermark.c
@@ -133,9 +133,11 @@ static char endis_ast(bool enabled)
 
 static int skl_num_planes(uint32_t d, int pipe)
 {
-	if (IS_GEN11(d))
+	int gen = intel_gen(d);
+
+	if (gen >= 11)
 		return 8;
-	else if (IS_GEN10(d) || IS_GEMINILAKE(d))
+	else if (gen == 10 || IS_GEMINILAKE(d))
 		return 5;
 	else if (IS_BROXTON(d))
 		return pipe == 2 ? 4 : 5;
@@ -145,9 +147,11 @@ static int skl_num_planes(uint32_t d, int pipe)
 
 static int skl_max_planes(uint32_t d)
 {
-	if (IS_GEN11(d))
+	int gen = intel_gen(d);
+
+	if (gen >= 11)
 		return 8;
-	else if (IS_GEN10(d) || IS_GEMINILAKE(d) || IS_BROXTON(d))
+	else if (gen == 10 || IS_GEMINILAKE(d) || IS_BROXTON(d))
 		return 5;
 	else
 		return 4;
-- 
2.26.3



More information about the igt-dev mailing list