[PATCH i-g-t] tests/kms_joiner: Reset the force_joiner_supported variable

[Karthik B S]

On 10/1/2024 4:29 PM, Nautiyal, Ankit K wrote:
>
> On 10/1/2024 3:15 PM, Karthik B S wrote:
>> With the current logic the test will fail on configs where the first
>> display supports force joiner and the second display doesn't supoprt it.
>> Reset the force_joiner_supported variable at the start of the loop to
>> avoid this failure.
>>
>> With this remove the redundant check in all the force joiner subtests
>> for force_joiner_supported as the following output check is inherently
>> checking this as well.
>>
>> Signed-off-by: Karthik B S <karthik.b.s at intel.com>
>> ---
>>   tests/intel/kms_joiner.c | 10 +---------
>>   1 file changed, 1 insertion(+), 9 deletions(-)
>>
>> diff --git a/tests/intel/kms_joiner.c b/tests/intel/kms_joiner.c
>> index 508e82ce3..198de9e43 100644
>> --- a/tests/intel/kms_joiner.c
>> +++ b/tests/intel/kms_joiner.c
>> @@ -418,7 +418,6 @@ igt_main
>>       data_t data;
>>         igt_fixture {
>> -        force_joiner_supported = false;
>>           ultra_joiner_supported = false;
>>           data.big_joiner_output_count = 0;
>>           data.ultra_joiner_output_count = 0;
>> @@ -443,6 +442,7 @@ igt_main
>>           for_each_connected_output(&data.display, output) {
>>               bool ultrajoiner_found = false, bigjoiner_found = false;
>>               drmModeConnector *connector = output->config.connector;
>> +            force_joiner_supported = false;
>
Hi Ankit,
> Perhaps declare this in the loop itself, we don't seem to need this 
> outside the loop.
Sure, will fix this in the next revision.
>
> With above addressed, this is:
>
> Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

Thank you for the review.

Thanks,
Karthik.B.S
>
>
>>                 /*
>>                * Bigjoiner will come in to the picture when the
>> @@ -539,8 +539,6 @@ igt_main
>>         igt_describe("Verify the basic modeset on big joiner mode on 
>> all pipes");
>>       igt_subtest_with_dynamic("basic-force-big-joiner") {
>> -        igt_require_f(force_joiner_supported,
>> -                  "force joiner not supported on this platform or 
>> none of the connected output supports it\n");
>>           igt_require_f(data.non_big_joiner_output_count > 0,
>>                     "No non big joiner output found\n");
>>           igt_require_f(data.n_pipes > 1,
>> @@ -560,8 +558,6 @@ igt_main
>>       }
>> igt_subtest_with_dynamic("invalid-modeset-force-big-joiner") {
>> -        igt_require_f(force_joiner_supported,
>> -                  "force joiner not supported on this platform or 
>> none of the connected output supports it\n");
>>           igt_require_f(data.non_big_joiner_output_count > 0,
>>                     "Non big joiner output not found\n");
>>           igt_require_f(data.n_pipes > 1,
>> @@ -584,8 +580,6 @@ igt_main
>>         igt_describe("Verify the basic modeset on ultra joiner mode 
>> on all pipes");
>>       igt_subtest_with_dynamic("basic-force-ultra-joiner") {
>> -        igt_require_f(force_joiner_supported,
>> -                  "force joiner not supported on this platform or 
>> none of the connected output supports it\n");
>>           igt_require_f(ultra_joiner_supported,
>>                     "Ultra joiner not supported on this platform\n");
>>           igt_require_f(data.non_ultra_joiner_output_count > 0,
>> @@ -600,8 +594,6 @@ igt_main
>>       }
>> igt_subtest_with_dynamic("invalid-modeset-force-ultra-joiner") {
>> -        igt_require_f(force_joiner_supported,
>> -                  "force joiner not supported on this platform or 
>> none of the connected output supports it\n");
>>           igt_require_f(ultra_joiner_supported,
>>                     "Ultra joiner not supported on this platform\n");
>>           igt_require_f(data.non_ultra_joiner_output_count > 0,