summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2020-09-09 17:54:35 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2021-05-17 23:00:29 +0300
commitfd8653673789e01c704f116da9c4a1b0ed097850 (patch)
tree15056552e946bdcc8e831f384222b0d33268aef1
parent9483ba94f8afb62035a553fd52c2c6323ce9216d (diff)
tools/intel_display_poller: Unify ilk+ and bdw+ codepaths
The ilk+ and bdw+ codepaths are identical, except for the ilk/snb pipe C check. Unify them. Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r--tools/intel_display_poller.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c
index 15da8e76..bb115598 100644
--- a/tools/intel_display_poller.c
+++ b/tools/intel_display_poller.c
@@ -1128,8 +1128,7 @@ int main(int argc, char *argv[])
default:
usage(argv[0]);
}
- } else if (HAS_PCH_SPLIT(devid) &&
- (IS_GEN5(devid) || IS_GEN6(devid) || IS_GEN7(devid))) {
+ } else {
if (pipe > 1 &&
(IS_GEN5(devid) || IS_GEN6(devid)))
usage(argv[0]);
@@ -1154,29 +1153,6 @@ int main(int argc, char *argv[])
default:
usage(argv[0]);
}
- } else if (intel_gen(devid) >= 8) {
- if (test_pixelcount)
- usage(argv[0]);
-
- switch (test) {
- case TEST_IIR:
- test = TEST_DEIIR;
- break;
- case TEST_FRAMECOUNT:
- test = TEST_FRAMECOUNT_G4X;
- break;
- case TEST_FLIPCOUNT:
- case TEST_PAN:
- case TEST_FLIP:
- case TEST_SURFLIVE:
- case TEST_WRAP:
- case TEST_FIELD:
- break;
- default:
- usage(argv[0]);
- }
- } else {
- usage(argv[0]);
}
switch (test) {