| Message ID | 20240401061235.192713-6-vignesh.raman@collabora.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/ci: Add support for GPU and display testing | expand |
On 01/04/2024 03:12, Vignesh Raman wrote: > For mediatek mt8173, the GPU driver is powervr and for mediatek > mt8183, the GPU driver is panfrost. So add support in drm-ci to > test panfrost and powervr GPU driver for mediatek SOCs and update > xfails. Powervr driver was merged in linux kernel, but there's no > mediatek support yet. So disable the mt8173-gpu job which uses > powervr driver. > > Add panfrost specific tests to testlist and skip KMS tests for > panfrost driver since it is not a not a KMS driver and skip > driver-specific tests. Also update the MAINTAINERS file to include > xfails for panfrost driver. > > Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> > --- > > v2: > - Add panfrost and PVR GPU jobs for mediatek SOC with new xfails, add xfail > entry to MAINTAINERS. > > v3: > - Add panfrost specific tests to testlist and skip KMS tests for > panfrost driver since it is not a not a KMS driver and update xfails. > Update the MAINTAINERS file to include xfails for panfrost driver. > Add the job name in GPU_VERSION and use it for xfail file names instead > of using DRIVER_NAME. > > v4: > - Remove the gpu suffix in job and rename xfails accordingly. > Update the MAINTAINERS file to include xfails for panfrost driver. > > v5: > - Add powervr-gpu and panfrost-gpu jobs and skip driver-specific tests. > > --- > MAINTAINERS | 1 + > drivers/gpu/drm/ci/gitlab-ci.yml | 2 ++ > drivers/gpu/drm/ci/test.yml | 24 +++++++++++++++++++ > .../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + > .../drm/ci/xfails/panfrost-mt8183-skips.txt | 8 +++++++ > 5 files changed, 36 insertions(+) > create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt > create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt > > diff --git a/MAINTAINERS b/MAINTAINERS > index f7d0040a6c21..333704ceefb6 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS Note: We'll also need an entry in MAINTAINERS file for powervr (but it is fine to only add it once we have tests running on it). Acked-by: Helen Koike <helen.koike@collabora.com> Thanks Helen > @@ -1666,6 +1666,7 @@ S: Supported > T: git git://anongit.freedesktop.org/drm/drm-misc > F: Documentation/gpu/panfrost.rst > F: drivers/gpu/drm/ci/testlist.txt > +F: drivers/gpu/drm/ci/xfails/panfrost* > F: drivers/gpu/drm/panfrost/ > F: include/uapi/drm/panfrost_drm.h > > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index d03d76692f0e..5b5d4a324659 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -111,6 +111,8 @@ stages: > - meson > - msm > - rockchip > + - panfrost > + - powervr > - virtio-gpu > > # YAML anchors for rule conditions > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml > index d8af670ee51d..adeb05bdb440 100644 > --- a/drivers/gpu/drm/ci/test.yml > +++ b/drivers/gpu/drm/ci/test.yml > @@ -292,6 +292,16 @@ amdgpu:stoney: > variables: > DRIVER_NAME: mediatek > > +.powervr-gpu: > + stage: powervr > + variables: > + DRIVER_NAME: powervr > + > +.panfrost-gpu: > + stage: panfrost > + variables: > + DRIVER_NAME: panfrost > + > .mt8173: > extends: > - .mediatek > @@ -315,11 +325,25 @@ mediatek:mt8173: > - .mt8173 > - .mediatek-display > > +powervr:mt8173: > + extends: > + - .mt8173 > + - .powervr-gpu > + rules: > + # TODO: powervr driver was merged in linux kernel, but there's no mediatek support yet > + # Remove the rule once mediatek support is added for powervr > + - when: never > + > mediatek:mt8183: > extends: > - .mt8183 > - .mediatek-display > > +panfrost:mt8183: > + extends: > + - .mt8183 > + - .panfrost-gpu > + > # drm-mtk doesn't even probe yet in mainline for mt8192 > .mediatek:mt8192: > extends: > diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt > new file mode 100644 > index 000000000000..6f5e760d5ec0 > --- /dev/null > +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt > @@ -0,0 +1 @@ > +panfrost_prime@gem-prime-import,Fail > diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt > new file mode 100644 > index 000000000000..41a846a59644 > --- /dev/null > +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt > @@ -0,0 +1,8 @@ > +# Panfrost is not a KMS driver, so skip the KMS tests > +kms_.* > + > +# Skip driver specific tests > +msm_.* > +^amdgpu.* > +v3d_.* > +vc4_.*
diff --git a/MAINTAINERS b/MAINTAINERS index f7d0040a6c21..333704ceefb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1666,6 +1666,7 @@ S: Supported T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/gpu/panfrost.rst F: drivers/gpu/drm/ci/testlist.txt +F: drivers/gpu/drm/ci/xfails/panfrost* F: drivers/gpu/drm/panfrost/ F: include/uapi/drm/panfrost_drm.h diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index d03d76692f0e..5b5d4a324659 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -111,6 +111,8 @@ stages: - meson - msm - rockchip + - panfrost + - powervr - virtio-gpu # YAML anchors for rule conditions diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index d8af670ee51d..adeb05bdb440 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -292,6 +292,16 @@ amdgpu:stoney: variables: DRIVER_NAME: mediatek +.powervr-gpu: + stage: powervr + variables: + DRIVER_NAME: powervr + +.panfrost-gpu: + stage: panfrost + variables: + DRIVER_NAME: panfrost + .mt8173: extends: - .mediatek @@ -315,11 +325,25 @@ mediatek:mt8173: - .mt8173 - .mediatek-display +powervr:mt8173: + extends: + - .mt8173 + - .powervr-gpu + rules: + # TODO: powervr driver was merged in linux kernel, but there's no mediatek support yet + # Remove the rule once mediatek support is added for powervr + - when: never + mediatek:mt8183: extends: - .mt8183 - .mediatek-display +panfrost:mt8183: + extends: + - .mt8183 + - .panfrost-gpu + # drm-mtk doesn't even probe yet in mainline for mt8192 .mediatek:mt8192: extends: diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt new file mode 100644 index 000000000000..6f5e760d5ec0 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt new file mode 100644 index 000000000000..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt @@ -0,0 +1,8 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.* + +# Skip driver specific tests +msm_.* +^amdgpu.* +v3d_.* +vc4_.*
For mediatek mt8173, the GPU driver is powervr and for mediatek mt8183, the GPU driver is panfrost. So add support in drm-ci to test panfrost and powervr GPU driver for mediatek SOCs and update xfails. Powervr driver was merged in linux kernel, but there's no mediatek support yet. So disable the mt8173-gpu job which uses powervr driver. Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver and skip driver-specific tests. Also update the MAINTAINERS file to include xfails for panfrost driver. Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> --- v2: - Add panfrost and PVR GPU jobs for mediatek SOC with new xfails, add xfail entry to MAINTAINERS. v3: - Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver and update xfails. Update the MAINTAINERS file to include xfails for panfrost driver. Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. v4: - Remove the gpu suffix in job and rename xfails accordingly. Update the MAINTAINERS file to include xfails for panfrost driver. v5: - Add powervr-gpu and panfrost-gpu jobs and skip driver-specific tests. --- MAINTAINERS | 1 + drivers/gpu/drm/ci/gitlab-ci.yml | 2 ++ drivers/gpu/drm/ci/test.yml | 24 +++++++++++++++++++ .../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + .../drm/ci/xfails/panfrost-mt8183-skips.txt | 8 +++++++ 5 files changed, 36 insertions(+) create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt