diff options
author | Bhanuprakash Modem <bhanuprakash.modem@intel.com> | 2022-04-13 15:56:08 +0530 |
---|---|---|
committer | Bhanuprakash Modem <bhanuprakash.modem@intel.com> | 2022-04-21 15:57:20 +0530 |
commit | df584c804e3a44431b0e5ae21c190b6e9acb35ab (patch) | |
tree | 9cbfc61cedb9133fffcd62b54bc31d9a548c70ec /tests/kms_setmode.c | |
parent | bc65f1ab45d8738f4e3a49927a80af4577e383b9 (diff) |
tests/kms_setmode: Fix the corner case in handling 5k+ modes
In below example, second combination (Pipe-B & Pipe-A) is invalid
as bigjoiner come in to the picture. Somehow we missed this corner
case in earlier fix, hence fixing now.
Starting dynamic subtest: pipe-A-DP-1-pipe-B-DP-4
Test id#1 CRTC count 2
CRTC[115] [Pipe A] Mode: 3840x2160@30Hz Connectors: DP-1[384]
CRTC[203] [Pipe B] Mode: 7680x4320@30Hz Connectors: DP-4[416]
Dynamic subtest pipe-A-DP-1-pipe-B-DP-4: SUCCESS (0.509s)
Starting dynamic subtest: pipe-B-DP-1-pipe-A-DP-4
Test id#2 CRTC count 2
CRTC[203] [Pipe B] Mode: 3840x2160@30Hz Connectors: DP-1[384]
CRTC[115] [Pipe A] Mode: 7680x4320@30Hz Connectors: DP-4[416]
Dynamic subtest pipe-B-DP-1-pipe-A-DP-4: FAIL (0.272s)
V2:
* Improve the logic
* Add comments
Cc: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Karthik B S <karthik.b.s@intel.com>
Diffstat (limited to 'tests/kms_setmode.c')
-rw-r--r-- | tests/kms_setmode.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 969ad75c..8c755091 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -676,10 +676,16 @@ static void test_one_combination(const struct test_config *tconf, * if mode.hdisplay > 5120, then ignore * - last crtc in single/multi-connector config * - consecutive crtcs in multi-connector config + * + * in multi-connector config ignore if + * - previous crtc mode.hdisplay > 5120 and + * - current & previous crtcs are consecutive */ - if ((crtc->mode.hdisplay > MAX_HDISPLAY_PER_CRTC) && - ((crtc->crtc_idx >= (tconf->resources->count_crtcs - 1)) || - (i < (crtc_count - 1) && abs(crtcs[i + 1].crtc_idx - crtc->crtc_idx) <= 1))) { + if (((crtc->mode.hdisplay > MAX_HDISPLAY_PER_CRTC) && + ((crtc->crtc_idx >= (tconf->resources->count_crtcs - 1)) || + ((i < (crtc_count - 1)) && (abs(crtcs[i + 1].crtc_idx - crtc->crtc_idx) <= 1)))) || + ((i > 0) && (crtc[i - 1].mode.hdisplay > MAX_HDISPLAY_PER_CRTC) && + (abs(crtc->crtc_idx - crtcs[i - 1].crtc_idx) <= 1))) { igt_info("Combo: %s is not possible with selected mode(s).\n", test_name); goto out; } |