Mesa (master): ci/lava: Update kernel for LAVA to 5.11

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a6aebdf2af927f24f57712837a18e38fef18b14c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6aebdf2af927f24f57712837a18e38fef18b14c

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Fri Apr  9 10:02:15 2021 +0200

ci/lava: Update kernel for LAVA to 5.11

Also enable CONFIG_DRM_AMDGPU_USERPTR to support GL_AMD_pinned_memory.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Acked-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10139>

---

 .gitlab-ci/container/x86_64.config | 1 +
 .gitlab-ci/lava-gitlab-ci.yml      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/x86_64.config b/.gitlab-ci/container/x86_64.config
index 049f4e13e82..05e8122a702 100644
--- a/.gitlab-ci/container/x86_64.config
+++ b/.gitlab-ci/container/x86_64.config
@@ -59,6 +59,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AMD=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=m
+CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_ACP=n
 CONFIG_ACPI_WMI=y
 CONFIG_MXM_WMI=y
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 2b4c8f3b61f..6840fcd82c6 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -12,9 +12,9 @@
   extends:
     - .kernel+rootfs
   variables:
-    KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
+    KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.11-for-mesa-ci/linux-v5.11-for-mesa-ci.tar.gz"
     INSTALL_KERNEL_MODULES: 1
-    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-20-piglit-radeonsi"
+    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-20-kernel-5.11"
     MINIO_SUFFIX: "lava"
 
 kernel+rootfs_amd64: