[igt-dev] [PATCH i-g-t] tests/kms_big_fb: Allow modeset to survive change of cdclk

[Juha-Pekka Heikkila]

On 16.4.2020 20.42, Ville Syrjälä wrote:
> On Thu, Apr 16, 2020 at 08:29:33PM +0300, Juha-Pekka Heikkila wrote:
>> When testing 64bpp formats there will come modeset to change cdclk.
>> Allow modesets on commits so commits will not produce error.
>>
>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
>> ---
>>   tests/kms_big_fb.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/kms_big_fb.c b/tests/kms_big_fb.c
>> index eb144da9..dabd16f3 100644
>> --- a/tests/kms_big_fb.c
>> +++ b/tests/kms_big_fb.c
>> @@ -294,6 +294,7 @@ static bool test_plane(data_t *data)
>>   		 */
>>   		if (i == 0 && data->display.is_atomic &&
>>   		    igt_display_try_commit_atomic(&data->display,
>> +						  DRM_MODE_ATOMIC_ALLOW_MODESET |
>>   						  DRM_MODE_ATOMIC_TEST_ONLY,
>>   						  NULL) != 0) {
>>   			if (igt_plane_has_prop(plane, IGT_PLANE_ROTATION))
>> @@ -318,8 +319,8 @@ static bool test_plane(data_t *data)
>>   		copy_pattern(data, small_fb, 0, 0, big_fb, x, y,
>>   			     small_fb->width, small_fb->height);
>>   
>> -		igt_display_commit2(&data->display, data->display.is_atomic ?
>> -				    COMMIT_ATOMIC : COMMIT_UNIVERSAL);
>> +		igt_display_commit2(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET |
> 
> That's not how you use igt_display_commit2(). And it also
> passes DRM_MODE_ATOMIC_ALLOW_MODESET to igt_atomic_commit().

Yea, I'll fix that. Seems it was too late hours yesterday making that patch.

> 
>> +				    data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_UNIVERSAL);
>>   
>>   
>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &small_crc);
>> -- 
>> 2.26.0
>>
>> _______________________________________________
>> igt-dev mailing list
>> igt-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/igt-dev
>