From patchwork Tue Apr 9 08:13:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13621978 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C59ECD129A for ; Tue, 9 Apr 2024 08:15:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=khZT9nmdWmBBmR+qlqcoaKfT3jM3rEDdH6CCDU70EV4=; b=snxUALcA2Jg2xc cBYY7A/iu16UYhiyHXQZLczutb0hOaKVDE/SZBguHSgO3VkOM2Ct5bp0pNc/LvtXi13oXUmcZfb2h KyqQ17CXL+ZeZPt8LfiL2aFedA81QqJ06XUT3L0Bqh/PA+lRAlbQWHEGzO+ZjKULMJaXEq/EW/WMf O35E357aBbiLmiU+bXmF3f7LQuVE/rvpEgVXVnvZoctot2AIFAxLleTiDagUGEz0u+MZZQxs28T6e A8VChdQ8/aNVg0Fp5JbBqQOLpgqmZp328hu9OYUQ5UdR2WuTyRIPLjp3TTEaAoqYeYm8Lo7ZjTNnb oNl6XJDIQ7aV0S80u/sg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru6dA-00000000tuU-3JoC; Tue, 09 Apr 2024 08:15:00 +0000 Received: from madrid.collaboradmins.com ([46.235.227.194]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru6cu-00000000tgg-1cb7; Tue, 09 Apr 2024 08:14:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1712650483; bh=60Q/1P2fpMs75p0GfobESC2ZjIr8MzFOnEDZw4kSue4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCl2+J797Re4J6vYq+lVqPStBt0617CroX8UoiwU+4hzNsKjiLPIXZxdBKruXK18M UKjpAfIlUruqhk80VBBo5Wts+XTS2JuhILNT/pmVgdpNioIwC5IymbVFUMYzbCoKN0 zhC05LDRHlGh5y7HdpOBLPlQCh2Rv+V+4pGMiW7rDvWLXTAz83/wfh4Unr2kQ5vgwJ gKw4bhW/M8uInAm6NmD/yh9N4YZSryCKdlg8PMY+ebvV6l3sfPVAu3O8nUhwTr9J6N offtG1QfmSqijudTGtinLS3vumgG/qO/3u5YTwYt87VZUEgk8oKI4Y6yXuXR9g1L7V es3eSD/BdGRkA== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: vignesh) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 96D1D378201A; Tue, 9 Apr 2024 08:14:39 +0000 (UTC) From: Vignesh Raman To: dri-devel@lists.freedesktop.org Cc: daniels@collabora.com, helen.koike@collabora.com, airlied@gmail.com, daniel@ffwll.ch, emma@anholt.net, robdclark@gmail.com, david.heidelberg@collabora.com, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, hamohammed.sa@gmail.com, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, mairacanal@riseup.net, mcanal@igalia.com, linux-mediatek@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 6/8] drm/ci: meson: add tests for meson display driver Date: Tue, 9 Apr 2024 13:43:27 +0530 Message-Id: <20240409081329.472463-7-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240409081329.472463-1-vignesh.raman@collabora.com> References: <20240409081329.472463-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240409_011444_704222_CF3F9076 X-CRM114-Status: GOOD ( 18.68 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org For Amlogic Meson G12B (A311D) SOC the display driver is meson and gpu driver is panfrost. Currently, in drm-ci for Meson G12B (A311D), only the gpu driver is tested. Refactor the existing meson jobs and add support in drm-ci to test both display and gpu driver for Amlogic Meson G12B (A311D) and update xfails. 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 for meson jobs. Skip kms tests for panfrost driver since it is not a kms driver and skip driver-specific tests. Signed-off-by: Vignesh Raman --- v2: - Refactor the patch to rename job to indicate display driver testing, rename the existing xfail files. v3: - Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. v4: - Remove the display suffix in job and rename xfails accordingly. Remove the change adding job name in GPU_VERSION. v5: - Add meson-display job. v6: - Squash commits for display and gpu driver testing. Reword the commit message. --- drivers/gpu/drm/ci/igt_runner.sh | 2 +- drivers/gpu/drm/ci/test.yml | 23 +++++++++++++++---- .../gpu/drm/ci/xfails/meson-g12b-fails.txt | 6 ----- .../gpu/drm/ci/xfails/meson-g12b-skips.txt | 1 + .../gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + .../gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 8 +++++++ 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 06946cd35491..1762b8870948 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -20,7 +20,7 @@ cat /sys/kernel/debug/dri/*/state set -e case "$DRIVER_NAME" in - rockchip|meson) + rockchip) export IGT_FORCE_DRIVER="panfrost" ;; amdgpu) diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 27930e29aabc..a453876509e9 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -354,25 +354,38 @@ panfrost:mt8183: GPU_VERSION: mt8192 RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0 -.meson: +.meson-device: extends: - .lava-igt:arm64 - stage: meson variables: - DRIVER_NAME: meson DTB: ${DEVICE_TYPE} BOOT_METHOD: u-boot KERNEL_IMAGE_TYPE: "image" -meson:g12b: +.meson-display: + stage: meson + variables: + DRIVER_NAME: meson + +.g12b: extends: - - .meson + - .meson-device parallel: 3 variables: DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 GPU_VERSION: g12b RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3 +meson:g12b: + extends: + - .g12b + - .meson-display + +panfrost:g12b: + extends: + - .g12b + - .panfrost-gpu + virtio_gpu:none: stage: virtio-gpu variables: diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt index 9e7c9683e74c..029b4ade21f6 100644 --- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt +++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt @@ -5,13 +5,7 @@ kms_cursor_legacy@single-bo,Fail kms_cursor_legacy@single-move,Fail kms_cursor_legacy@torture-bo,Fail kms_cursor_legacy@torture-move,Fail -kms_force_connector_basic@force-edid,Fail -kms_hdmi_inject@inject-4k,Fail -kms_plane_cursor@overlay,Fail -kms_plane_cursor@primary,Fail -kms_plane_cursor@viewport,Fail kms_properties@connector-properties-atomic,Fail kms_properties@connector-properties-legacy,Fail kms_properties@get_properties-sanity-atomic,Fail kms_properties@get_properties-sanity-non-atomic,Fail -panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt index beb8d37362cf..f1a96db6a64e 100644 --- a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt +++ b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt @@ -1,5 +1,6 @@ # Skip driver specific tests msm_.* ^amdgpu.* +panfrost_.* v3d_.* vc4_.* diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt new file mode 100644 index 000000000000..6f5e760d5ec0 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt new file mode 100644 index 000000000000..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-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_.*