commit c9c53dade01ede6d6ab0a3b280dc309cf1dd317c
author Tomeu Vizoso <tomeu.vizoso@collabora.com> Tue Aug 18 11:20:20 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Wed Aug 19 07:39:22 2020 +0000
tree 2dd56de6e46ef8f8119d8410632d1c65422a5189
parent 91cd7fe97848d8b57a90bea81c41306602cc1b32

ci: Update kernel used in LAVA to 5.8-based drm-misc

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6371>

.gitlab-ci/lava-gitlab-ci.yml

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 @@
     - .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

.gitlab-ci/x86_64.config

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_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