summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2021-04-09 15:04:41 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2021-05-14 16:03:33 +0300
commit285f5bd86525d3d74eb9ea9821a2e5a93e57be35 (patch)
tree32617310b7eb4f2b73db04e0836f3dd0f43e7a92
parent39f4ae4184c32c1a5beeed3e1cf27deef1181108 (diff)
tools/intel_watermark: Deal with TGL planes
TGL has the same amount of planes as ICL. Make intel_watermark aware of that fact. v2: Use intel_gen() Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@gmail.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r--tools/intel_watermark.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index 39aaf9fb..4a5764b5 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;