From c9c53dade01ede6d6ab0a3b280dc309cf1dd317c Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 18 Aug 2020 11:20:20 +0200 Subject: [PATCH] ci: Update kernel used in LAVA to 5.8-based drm-misc Signed-off-by: Tomeu Vizoso Acked-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/lava-gitlab-ci.yml | 4 ++-- .gitlab-ci/x86_64.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index f7c6002..a6ac47c 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2020-08-03-nfs-2" + DISTRIBUTION_TAG: "2020-08-18-new-kernel-6" .kernel+rootfs: stage: container-2 @@ -7,7 +7,7 @@ variables: - .ci-run-policy variables: GIT_STRATEGY: fetch - KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.5-panfrost-fixes/linux-v5.5-panfrost-fixes.tar.gz" + KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.8-for-mesa-ci/linux-v5.8-for-mesa-ci.tar.gz" UPLOAD_FOR_LAVA: 1 script: - .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/x86_64.config b/.gitlab-ci/x86_64.config index 2a28645..46d0d97 100644 --- a/.gitlab-ci/x86_64.config +++ b/.gitlab-ci/x86_64.config @@ -54,7 +54,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_AMD=y CONFIG_DRM_AMDGPU=y CONFIG_DRM_AMDGPU_SI=y -CONFIG_DRM_AMD_ACP=y +CONFIG_DRM_AMD_ACP=n CONFIG_ACPI_WMI=y CONFIG_MXM_WMI=y CONFIG_PARPORT=y -- 2.7.4