Re: [PATCH v5 04/10] drm/ci: mediatek: Refactor existing mediatek jobs

[Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx>]

Hi Helen,

On 01/04/24 22:12, Helen Koike wrote:
> On 01/04/2024 03:12, Vignesh Raman wrote:
> > For mediatek mt8173 and mt8183, the display driver is mediatek.
> > Currently, in drm-ci for mediatek, only the display driver is
> > tested. Refactor the existing mediatek jobs so that gpu driver
> > testing jobs can be added later and update xfails accordingly.
> > Since the correct driver name is passed from the job to test gpu
> > and display driver, remove the check to set IGT_FORCE_DRIVER
> > based on driver name.
> >
> > Signed-off-by: Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx>
> > ---
> >
> > v2:
> >    - Refactor the patch to rename job to indicate display driver testing,
> >      rename the existing xfail files, and remove IGT_FORCE_DRIVER from 
> > the
> >      script since it's now set by the job.
> >
> > v3:
> >    - Add the job name in GPU_VERSION and use it for xfail file names 
> > instead
> >      of using DRIVER_NAME. Also update xfails.
> >
> > v4:
> >    - Remove the display suffix in job and rename xfails accordingly.
> >      Remove the change adding job name in GPU_VERSION.
> >
> > v5:
> >    - Add mediatek-display job.
> >
> > ---
> >   drivers/gpu/drm/ci/igt_runner.sh              | 10 ---------
> >   drivers/gpu/drm/ci/test.yml                   | 21 +++++++++++++++----
> >   .../drm/ci/xfails/mediatek-mt8173-fails.txt   | 15 -------------
> >   .../drm/ci/xfails/mediatek-mt8173-flakes.txt  | 13 ++++++++++++
> >   .../drm/ci/xfails/mediatek-mt8183-fails.txt   | 21 ++++++++++++-------
> >   .../drm/ci/xfails/mediatek-mt8183-flakes.txt  |  8 +++++++
> >   6 files changed, 51 insertions(+), 37 deletions(-)
> >   create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
> >   create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
> >
> > diff --git a/drivers/gpu/drm/ci/igt_runner.sh 
> > b/drivers/gpu/drm/ci/igt_runner.sh
> > index f1a08b9b146f..ce6e22369d4d 100755
> > --- a/drivers/gpu/drm/ci/igt_runner.sh
> > +++ b/drivers/gpu/drm/ci/igt_runner.sh
> > @@ -20,16 +20,6 @@ cat /sys/kernel/debug/dri/*/state
> >   set -e
> >   case "$DRIVER_NAME" in
> > -    rockchip|meson)
> > -        export IGT_FORCE_DRIVER="panfrost"
> > -        ;;
> > -    mediatek)
> > -        if [ "$GPU_VERSION" = "mt8173" ]; then
> > -            export IGT_FORCE_DRIVER=${DRIVER_NAME}
> > -        elif [ "$GPU_VERSION" = "mt8183" ]; then
> > -            export IGT_FORCE_DRIVER="panfrost"
> > -        fi
> > -        ;;
> >       amdgpu)
> >           # Cannot use HWCI_KERNEL_MODULES as at that point we don't 
> > have the module in /lib
> >           mv /install/modules/lib/modules/* /lib/modules/.
> > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
> > index 612c9ede3507..d8af670ee51d 100644
> > --- a/drivers/gpu/drm/ci/test.yml
> > +++ b/drivers/gpu/drm/ci/test.yml
> > @@ -282,14 +282,17 @@ amdgpu:stoney:
> >   .mediatek:
>
> Maybe we could s/.mediatek/.mediatek-device, so we know we are not 
> talking about the driver name, what do you think?

Yes, will rename this.

Regards,
Vignesh

> >     extends:
> >       - .lava-igt:arm64
> > -  stage: mediatek
> >     variables:
> > -    DRIVER_NAME: mediatek
> >       DTB: ${DEVICE_TYPE}
> >       BOOT_METHOD: depthcharge
> >       KERNEL_IMAGE_TYPE: ""
> > -mediatek:mt8173:
> > +.mediatek-display:
> > +  stage: mediatek
> > +  variables:
> > +    DRIVER_NAME: mediatek
> > +
> > +.mt8173:
> >     extends:
> >       - .mediatek
> >     parallel: 4
> > @@ -298,7 +301,7 @@ mediatek:mt8173:
> >       GPU_VERSION: mt8173
> >       RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
> > -mediatek:mt8183:
> > +.mt8183:
> >     extends:
> >       - .mediatek
> >     parallel: 3
> > @@ -307,6 +310,16 @@ mediatek:mt8183:
> >       GPU_VERSION: mt8183
> >       RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
> > +mediatek:mt8173:
> > +  extends:
> > +    - .mt8173
> > +    - .mediatek-display
> > +
> > +mediatek:mt8183:
> > +  extends:
> > +    - .mt8183
> > +    - .mediatek-display
>
>  From the code, panfrost was being used in IGT_FORCE_DRIVER for mt8183 
> no? --> never mind, I just saw the next patch handles panfrost case. I 
> guess these two commits could be squashed (up to you).
>
> Regards,
> Helen
>
> > +
> >   # drm-mtk doesn't even probe yet in mainline for mt8192
> >   .mediatek:mt8192:
> >     extends:
> > diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt 
> > b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
> > index ef0cb7c3698c..c63abd603b02 100644
> > --- a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
> > +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
> > @@ -9,28 +9,13 @@ kms_bw@linear-tiling-3-displays-1920x1080p,Fail
> >   kms_bw@linear-tiling-3-displays-2560x1440p,Fail
> >   kms_bw@linear-tiling-3-displays-3840x2160p,Fail
> >   kms_color@invalid-gamma-lut-sizes,Fail
> > -kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
> > -kms_color@pipe-B-invalid-gamma-lut-sizes,Fail
> >   kms_cursor_legacy@cursor-vs-flip-atomic,Fail
> >   kms_cursor_legacy@cursor-vs-flip-legacy,Fail
> >   kms_flip@flip-vs-modeset-vs-hang,Fail
> >   kms_flip@flip-vs-panning-vs-hang,Fail
> >   kms_flip@flip-vs-suspend,Fail
> >   kms_flip@flip-vs-suspend-interruptible,Fail
> > -kms_force_connector_basic@force-edid,Fail
> > -kms_force_connector_basic@force-load-detect,Fail
> > -kms_force_connector_basic@prune-stale-modes,Fail
> > -kms_hdmi_inject@inject-4k,Fail
> > -kms_plane_scaling@planes-upscale-20x20,Fail
> > -kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25,Fail
> > -kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5,Fail
> > -kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-75,Fail
> > -kms_plane_scaling@upscale-with-modifier-20x20,Fail
> > -kms_plane_scaling@upscale-with-pixel-format-20x20,Fail
> > -kms_plane_scaling@upscale-with-rotation-20x20,Fail
> >   kms_properties@get_properties-sanity-atomic,Fail
> >   kms_properties@plane-properties-atomic,Fail
> >   kms_properties@plane-properties-legacy,Fail
> >   kms_rmfb@close-fd,Fail
> > -kms_selftest@drm_format,Timeout
> > -kms_selftest@drm_format_helper,Timeout
> > diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt 
> > b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
> > new file mode 100644
> > index 000000000000..64b30c092c85
> > --- /dev/null
> > +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
> > @@ -0,0 +1,13 @@
> > +# Board Name: mt8173-elm-hana.dtb
> > +# Bug Report: 
> > https://lore.kernel.org/dri-devel/931e3f9a-9c5c-fc42-16fc-abaac4e0c0ff@xxxxxxxxxxxxx/T/#u
> > +# IGT Version: 1.28-gd2af13d9f
> > +# Failure Rate: 50
> > +# Linux Version: 6.7.0-rc3
> > +
> > +# Reported by deqp-runner
> > +kms_cursor_legacy@cursor-vs-flip-atomic-transitions
> > +
> > +# Below test shows inconsistency across multiple runs,
> > +# giving results of Pass and Timeout/Fail alternately
> > +kms_prop_blob@invalid-set-prop
> > +kms_prop_blob@invalid-set-prop-any
> > diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt 
> > b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
> > index 67d690fc4037..91cd1c4ec068 100644
> > --- a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
> > +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
> > @@ -1,13 +1,18 @@
> > -kms_addfb_basic@addfb25-bad-modifier,Fail
> > +core_setmaster_vs_auth,Fail
> > +kms_bw@linear-tiling-1-displays-1920x1080p,Fail
> >   kms_bw@linear-tiling-1-displays-2560x1440p,Fail
> > +kms_bw@linear-tiling-1-displays-3840x2160p,Fail
> >   kms_bw@linear-tiling-2-displays-1920x1080p,Fail
> >   kms_bw@linear-tiling-2-displays-2560x1440p,Fail
> >   kms_bw@linear-tiling-2-displays-3840x2160p,Fail
> > -kms_bw@linear-tiling-3-displays-2560x1440p,Fail
> > -kms_bw@linear-tiling-3-displays-3840x2160p,Fail
> > -kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
> > -kms_plane_cursor@overlay,Fail
> > -kms_plane_cursor@primary,Fail
> > -kms_plane_cursor@viewport,Fail
> > -kms_plane_scaling@upscale-with-rotation-20x20,Fail
> > +kms_color@invalid-gamma-lut-sizes,Fail
> > +kms_cursor_legacy@cursor-vs-flip-atomic,Fail
> > +kms_cursor_legacy@cursor-vs-flip-legacy,Fail
> > +kms_flip@flip-vs-modeset-vs-hang,Fail
> > +kms_flip@flip-vs-panning-vs-hang,Fail
> > +kms_flip@flip-vs-suspend,Fail
> > +kms_flip@flip-vs-suspend-interruptible,Fail
> > +kms_properties@get_properties-sanity-atomic,Fail
> > +kms_properties@plane-properties-atomic,Fail
> > +kms_properties@plane-properties-legacy,Fail
> >   kms_rmfb@close-fd,Fail
> > diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt 
> > b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
> > new file mode 100644
> > index 000000000000..5885a950fa72
> > --- /dev/null
> > +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
> > @@ -0,0 +1,8 @@
> > +# Board Name: mt8183-kukui-jacuzzi-juniper-sku16.dtb
> > +# Bug Report: 
> > https://lore.kernel.org/dri-devel/931e3f9a-9c5c-fc42-16fc-abaac4e0c0ff@xxxxxxxxxxxxx/T/#u
> > +# IGT Version: 1.28-gd2af13d9f
> > +# Failure Rate: 100
> > +# Linux Version: 6.7.0-rc3
> > +
> > +# Reported by deqp-runner
> > +kms_cursor_legacy@cursor-vs-flip-atomic-transitions