Hi Rob,
Thanks for the patch.
On 20/09/2023 15:10, Rob Clark wrote:
> On Wed, Sep 20, 2023 at 11:06 AM Rob Clark <[email protected]> wrote:
>>
>> From: Rob Clark <[email protected]>
>>
>> There have been a few igt test fixes compared to the commit that we were
>> currently using. Pull in a newer igt and update expectations.
>>
>> Signed-off-by: Rob Clark <[email protected]>
>> ---
Could you send here the url of a pipeline run with this change?
>> drivers/gpu/drm/ci/gitlab-ci.yml | 2 +-
>> .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 4 ++--
>> drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 11 -----------
>> drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 2 +-
>> drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 1 -
>> drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 18 +-----------------
>> .../drm/ci/xfails/rockchip-rk3288-fails.txt | 2 ++
>> 7 files changed, 7 insertions(+), 33 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
>> index 2c4df53f5dfe..3ecb5879e80f 100644
>> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
>> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
>> @@ -5,7 +5,7 @@ variables:
>> UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
>> TARGET_BRANCH: drm-next
>>
>> - IGT_VERSION: 471bfababd070e1dac0ebb87470ac4f2ae85e663
>> + IGT_VERSION: 2517e42d612e0c1ca096acf8b5f6177f7ef4bce7
>>
>> DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
>> DEQP_RUNNER_GIT_TAG: v0.15.0
>> diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
>> index bd9392536e7c..bab21930a0d4 100644
>> --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
>> +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
>> @@ -1,7 +1,6 @@
>> kms_addfb_basic@bad-pitch-65536,Fail
>> kms_addfb_basic@bo-too-small,Fail
>> kms_async_flips@invalid-async-flip,Fail
>> -kms_atomic@plane-immutable-zpos,Fail
>> kms_atomic_transition@plane-toggle-modeset-transition,Fail
>> kms_bw@linear-tiling-1-displays-2560x1440p,Fail
>> kms_bw@linear-tiling-1-displays-3840x2160p,Fail
>> @@ -11,9 +10,10 @@ kms_color@degamma,Fail
>> kms_cursor_crc@cursor-size-change,Fail
>> kms_cursor_crc@pipe-A-cursor-size-change,Fail
>> kms_cursor_crc@pipe-B-cursor-size-change,Fail
>> -kms_cursor_legacy@forked-move,Fail
>> kms_hdr@bpc-switch,Fail
>> kms_hdr@bpc-switch-dpms,Fail
>> kms_plane_multiple@atomic-pipe-A-tiling-none,Fail
>> kms_rmfb@close-fd,Fail
>> kms_rotation_crc@primary-rotation-180,Fail
>> +kms_flip@flip-vs-modeset-vs-hang,Fail
>> +kms_flip@flip-vs-panning-vs-hang,Fail
>> diff --git a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
>> index 46397ce38d5a..2e3b7c5dac3c 100644
>> --- a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
>> +++ b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
>> @@ -8,13 +8,6 @@ kms_bw@linear-tiling-3-displays-3840x2160p,Fail
>> kms_bw@linear-tiling-4-displays-1920x1080p,Fail
>> kms_bw@linear-tiling-4-displays-2560x1440p,Fail
>> kms_bw@linear-tiling-4-displays-3840x2160p,Fail
>> -kms_color@ctm-0-25,Fail
>> -kms_color@ctm-0-50,Fail
>> -kms_color@ctm-0-75,Fail
>> -kms_color@ctm-max,Fail
>> -kms_color@ctm-negative,Fail
>> -kms_color@ctm-red-to-blue,Fail
>> -kms_color@ctm-signed,Fail
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
>> kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
>> @@ -38,8 +31,6 @@ kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-upscaling,Fail
>> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling,Fail
>> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling,Fail
>> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling,Fail
>> -kms_hdmi_inject@inject-4k,Timeout
>> -kms_plane@plane-position-hole,Timeout
>> kms_plane_alpha_blend@alpha-basic,Fail
>> kms_plane_alpha_blend@alpha-opaque-fb,Fail
>> kms_plane_alpha_blend@alpha-transparent-fb,Fail
>> @@ -53,6 +44,4 @@ kms_plane_alpha_blend@pipe-B-constant-alpha-max,Fail
>> kms_plane_alpha_blend@pipe-C-alpha-opaque-fb,Fail
>> kms_plane_alpha_blend@pipe-C-alpha-transparent-fb,Fail
>> kms_plane_alpha_blend@pipe-C-constant-alpha-max,Fail
>> -kms_plane_multiple@tiling-y,Timeout
>> -kms_pwrite_crc,Timeout
>> kms_sysfs_edid_timing,Fail
>> diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
>> index 6139b410e767..13c0a25fc627 100644
>> --- a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
>> +++ b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
>> @@ -1,4 +1,3 @@
>> -kms_color@ctm-0-25,Fail
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
>> kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
>> @@ -16,3 +15,4 @@ kms_plane_alpha_blend@alpha-basic,Fail
>> kms_plane_alpha_blend@alpha-opaque-fb,Fail
>> kms_plane_alpha_blend@alpha-transparent-fb,Fail
>> kms_plane_alpha_blend@constant-alpha-max,Fail
>> +kms_async_flips@crc,Fail
>> diff --git a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
>> index a6da5544e198..27bfca1c6f2c 100644
>> --- a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
>> +++ b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
>> @@ -8,7 +8,6 @@ kms_bw@linear-tiling-4-displays-3840x2160p,Fail
>> kms_bw@linear-tiling-5-displays-1920x1080p,Fail
>> kms_bw@linear-tiling-5-displays-2560x1440p,Fail
>> kms_bw@linear-tiling-5-displays-3840x2160p,Fail
>> -kms_color@ctm-0-25,Fail
>> kms_flip@flip-vs-panning-vs-hang,Timeout
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
>> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
>> diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
>> index 410e0eeb3161..e59a2fddfde0 100644
>> --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
>> +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
>
> Side note, I noticed for sc7180-skips (and a lot of other boards) we have:
>
> # Suspend to RAM seems to be broken on this machine
> .*suspend.*
>
> Locally I've not had problems with the suspend tests, I'm guessing the
> actual issue is usb-ethernet vs nfsroot. But maybe the filesys for
> igt jobs is small enough that we can do initramfs instead? Someone
> should probably confirm what the root issue is and update the
> comments, so developers aren't thinking that suspend is something that
> needs to be debugged
Agreed.
Regards,
Helen
>
> BR,
> -R
>
>
>> @@ -4,20 +4,4 @@
>> # Test incorrectly assumes that CTM support implies gamma/degamma
>> # LUT support. None of the subtests handle the case of only having
>> # CTM support
>> -kms_color.*
>> -
>> -# 4k@60 is not supported on this hw, but driver doesn't handle it
>> -# too gracefully.. https://gitlab.freedesktop.org/drm/msm/-/issues/15
>> -kms_bw@linear-tiling-.*-displays-3840x2160p
>> -
>> -# Until igt fix lands: https://patchwork.freedesktop.org/patch/493175/
>> -kms_bw@linear-tiling-2.*
>> -kms_bw@linear-tiling-3.*
>> -kms_bw@linear-tiling-4.*
>> -kms_bw@linear-tiling-5.*
>> -kms_bw@linear-tiling-6.*
>> -
>> -# igt fix posted: https://patchwork.freedesktop.org/patch/499926/
>> -# failure mode is flakey due to randomization but fails frequently
>> -# enough to be detected as a Crash or occasionally UnexpectedPass.
>> -kms_plane_multiple@atomic-pipe-A-tiling-none
>> +#kms_color.*
>> diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
>> index 2a1baa948e12..15ac861a58bf 100644
>> --- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
>> +++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
>> @@ -46,3 +46,5 @@ kms_properties@connector-properties-legacy,Crash
>> kms_properties@get_properties-sanity-atomic,Crash
>> kms_properties@get_properties-sanity-non-atomic,Crash
>> kms_setmode@invalid-clone-single-crtc,Crash
>> +kms_flip@flip-vs-modeset-vs-hang,Crash
>> +kms_flip@flip-vs-panning-vs-hang,Crash
>> --
>> 2.41.0
>>
On Wed, Sep 20, 2023 at 11:53 AM Helen Koike <[email protected]> wrote:
>
> Hi Rob,
>
> Thanks for the patch.
>
> On 20/09/2023 15:10, Rob Clark wrote:
> > On Wed, Sep 20, 2023 at 11:06 AM Rob Clark <[email protected]> wrote:
> >>
> >> From: Rob Clark <[email protected]>
> >>
> >> There have been a few igt test fixes compared to the commit that we were
> >> currently using. Pull in a newer igt and update expectations.
> >>
> >> Signed-off-by: Rob Clark <[email protected]>
> >> ---
>
> Could you send here the url of a pipeline run with this change?
https://gitlab.freedesktop.org/drm/msm/-/pipelines/989913
That was before I wrote a proper commit msg so you can ignore the
checkpatch job.. and there is an unrelated issue with the sdm845
runners not booting w/ v6.6-rc2, which still needs to be tracked down.
BR,
-R
> >> drivers/gpu/drm/ci/gitlab-ci.yml | 2 +-
> >> .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 4 ++--
> >> drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 11 -----------
> >> drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 2 +-
> >> drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 1 -
> >> drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 18 +-----------------
> >> .../drm/ci/xfails/rockchip-rk3288-fails.txt | 2 ++
> >> 7 files changed, 7 insertions(+), 33 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
> >> index 2c4df53f5dfe..3ecb5879e80f 100644
> >> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
> >> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
> >> @@ -5,7 +5,7 @@ variables:
> >> UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
> >> TARGET_BRANCH: drm-next
> >>
> >> - IGT_VERSION: 471bfababd070e1dac0ebb87470ac4f2ae85e663
> >> + IGT_VERSION: 2517e42d612e0c1ca096acf8b5f6177f7ef4bce7
> >>
> >> DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
> >> DEQP_RUNNER_GIT_TAG: v0.15.0
> >> diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
> >> index bd9392536e7c..bab21930a0d4 100644
> >> --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
> >> @@ -1,7 +1,6 @@
> >> kms_addfb_basic@bad-pitch-65536,Fail
> >> kms_addfb_basic@bo-too-small,Fail
> >> kms_async_flips@invalid-async-flip,Fail
> >> -kms_atomic@plane-immutable-zpos,Fail
> >> kms_atomic_transition@plane-toggle-modeset-transition,Fail
> >> kms_bw@linear-tiling-1-displays-2560x1440p,Fail
> >> kms_bw@linear-tiling-1-displays-3840x2160p,Fail
> >> @@ -11,9 +10,10 @@ kms_color@degamma,Fail
> >> kms_cursor_crc@cursor-size-change,Fail
> >> kms_cursor_crc@pipe-A-cursor-size-change,Fail
> >> kms_cursor_crc@pipe-B-cursor-size-change,Fail
> >> -kms_cursor_legacy@forked-move,Fail
> >> kms_hdr@bpc-switch,Fail
> >> kms_hdr@bpc-switch-dpms,Fail
> >> kms_plane_multiple@atomic-pipe-A-tiling-none,Fail
> >> kms_rmfb@close-fd,Fail
> >> kms_rotation_crc@primary-rotation-180,Fail
> >> +kms_flip@flip-vs-modeset-vs-hang,Fail
> >> +kms_flip@flip-vs-panning-vs-hang,Fail
> >> diff --git a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
> >> index 46397ce38d5a..2e3b7c5dac3c 100644
> >> --- a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
> >> @@ -8,13 +8,6 @@ kms_bw@linear-tiling-3-displays-3840x2160p,Fail
> >> kms_bw@linear-tiling-4-displays-1920x1080p,Fail
> >> kms_bw@linear-tiling-4-displays-2560x1440p,Fail
> >> kms_bw@linear-tiling-4-displays-3840x2160p,Fail
> >> -kms_color@ctm-0-25,Fail
> >> -kms_color@ctm-0-50,Fail
> >> -kms_color@ctm-0-75,Fail
> >> -kms_color@ctm-max,Fail
> >> -kms_color@ctm-negative,Fail
> >> -kms_color@ctm-red-to-blue,Fail
> >> -kms_color@ctm-signed,Fail
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
> >> kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
> >> @@ -38,8 +31,6 @@ kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-upscaling,Fail
> >> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling,Fail
> >> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling,Fail
> >> kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling,Fail
> >> -kms_hdmi_inject@inject-4k,Timeout
> >> -kms_plane@plane-position-hole,Timeout
> >> kms_plane_alpha_blend@alpha-basic,Fail
> >> kms_plane_alpha_blend@alpha-opaque-fb,Fail
> >> kms_plane_alpha_blend@alpha-transparent-fb,Fail
> >> @@ -53,6 +44,4 @@ kms_plane_alpha_blend@pipe-B-constant-alpha-max,Fail
> >> kms_plane_alpha_blend@pipe-C-alpha-opaque-fb,Fail
> >> kms_plane_alpha_blend@pipe-C-alpha-transparent-fb,Fail
> >> kms_plane_alpha_blend@pipe-C-constant-alpha-max,Fail
> >> -kms_plane_multiple@tiling-y,Timeout
> >> -kms_pwrite_crc,Timeout
> >> kms_sysfs_edid_timing,Fail
> >> diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
> >> index 6139b410e767..13c0a25fc627 100644
> >> --- a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
> >> @@ -1,4 +1,3 @@
> >> -kms_color@ctm-0-25,Fail
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
> >> kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
> >> @@ -16,3 +15,4 @@ kms_plane_alpha_blend@alpha-basic,Fail
> >> kms_plane_alpha_blend@alpha-opaque-fb,Fail
> >> kms_plane_alpha_blend@alpha-transparent-fb,Fail
> >> kms_plane_alpha_blend@constant-alpha-max,Fail
> >> +kms_async_flips@crc,Fail
> >> diff --git a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
> >> index a6da5544e198..27bfca1c6f2c 100644
> >> --- a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
> >> @@ -8,7 +8,6 @@ kms_bw@linear-tiling-4-displays-3840x2160p,Fail
> >> kms_bw@linear-tiling-5-displays-1920x1080p,Fail
> >> kms_bw@linear-tiling-5-displays-2560x1440p,Fail
> >> kms_bw@linear-tiling-5-displays-3840x2160p,Fail
> >> -kms_color@ctm-0-25,Fail
> >> kms_flip@flip-vs-panning-vs-hang,Timeout
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
> >> kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
> >> diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
> >> index 410e0eeb3161..e59a2fddfde0 100644
> >> --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
> >
> > Side note, I noticed for sc7180-skips (and a lot of other boards) we have:
> >
> > # Suspend to RAM seems to be broken on this machine
> > .*suspend.*
> >
> > Locally I've not had problems with the suspend tests, I'm guessing the
> > actual issue is usb-ethernet vs nfsroot. But maybe the filesys for
> > igt jobs is small enough that we can do initramfs instead? Someone
> > should probably confirm what the root issue is and update the
> > comments, so developers aren't thinking that suspend is something that
> > needs to be debugged
>
> Agreed.
>
> Regards,
> Helen
>
> >
> > BR,
> > -R
> >
> >
> >> @@ -4,20 +4,4 @@
> >> # Test incorrectly assumes that CTM support implies gamma/degamma
> >> # LUT support. None of the subtests handle the case of only having
> >> # CTM support
> >> -kms_color.*
> >> -
> >> -# 4k@60 is not supported on this hw, but driver doesn't handle it
> >> -# too gracefully.. https://gitlab.freedesktop.org/drm/msm/-/issues/15
> >> -kms_bw@linear-tiling-.*-displays-3840x2160p
> >> -
> >> -# Until igt fix lands: https://patchwork.freedesktop.org/patch/493175/
> >> -kms_bw@linear-tiling-2.*
> >> -kms_bw@linear-tiling-3.*
> >> -kms_bw@linear-tiling-4.*
> >> -kms_bw@linear-tiling-5.*
> >> -kms_bw@linear-tiling-6.*
> >> -
> >> -# igt fix posted: https://patchwork.freedesktop.org/patch/499926/
> >> -# failure mode is flakey due to randomization but fails frequently
> >> -# enough to be detected as a Crash or occasionally UnexpectedPass.
> >> -kms_plane_multiple@atomic-pipe-A-tiling-none
> >> +#kms_color.*
> >> diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
> >> index 2a1baa948e12..15ac861a58bf 100644
> >> --- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
> >> +++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
> >> @@ -46,3 +46,5 @@ kms_properties@connector-properties-legacy,Crash
> >> kms_properties@get_properties-sanity-atomic,Crash
> >> kms_properties@get_properties-sanity-non-atomic,Crash
> >> kms_setmode@invalid-clone-single-crtc,Crash
> >> +kms_flip@flip-vs-modeset-vs-hang,Crash
> >> +kms_flip@flip-vs-panning-vs-hang,Crash
> >> --
> >> 2.41.0
> >>