VERSION: bump for 24.0.0-rc2

radv/rt: Add workaround to make leaves always active
DOOM Eternal builds acceleration structures with inactive primitives and tries to make them active in later AS updates. This is disallowed by the spec and triggers a GPU hang. Fix the hang by working around the bug. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27034> (cherry picked from commit a9831caa14)
2024-01-17 22:28:20 +00:00 · 2024-01-17 21:42:02 +00:00 · 2024-01-17 21:41:44 +00:00 · 2024-01-17 21:39:08 +00:00 · 2024-01-17 21:39:06 +00:00 · 2024-01-17 21:39:02 +00:00
5524 changed files with 212336 additions and 568848 deletions
--- a/.ci-farms-disabled/vmware
+++ b/.ci-farms-disabled/vmware
--- a/.clang-format-include
+++ b/.clang-format-include
@@ -2,7 +2,6 @@
 # enforcement in the CI.

 src/gallium/drivers/i915
-src/gallium/targets/teflon/**/*
 src/amd/vulkan/**/*
 src/amd/compiler/**/*
 src/egl/**/*
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-.cache
 .vscode*
 *.pyc
 *.pyo
 *.out
 /build
-.venv/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ workflow:
    # merge pipeline
    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        MESA_CI_PERFORMANCE_ENABLED: 1
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
    # post-merge pipeline
@@ -41,24 +41,24 @@ workflow:
    # nightly pipeline
    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        JOB_PRIORITY: 50
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
    # pipeline for direct pushes that bypassed the CI
    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        JOB_PRIORITY: 40
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
    # pre-merge or fork pipeline
    - if: $FORCE_KERNEL_TAG != null
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
        JOB_PRIORITY: 50
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
    - if: $FORCE_KERNEL_TAG == null
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        JOB_PRIORITY: 50
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low

@@ -72,24 +72,14 @@ variables:
          bash download-git-cache.sh
          rm download-git-cache.sh
          set +o xtrace
-  S3_JWT_FILE: /s3_jwt
+  CI_JOB_JWT_FILE: /minio_jwt
  S3_HOST: s3.freedesktop.org
-  # This bucket is used to fetch the kernel image
-  S3_KERNEL_BUCKET: mesa-rootfs
-  # Bucket for git cache
-  S3_GITCACHE_BUCKET: git-cache
-  # Bucket for the pipeline artifacts pushed to S3
-  S3_ARTIFACTS_BUCKET: artifacts
-  # Buckets for traces
-  S3_TRACIE_RESULTS_BUCKET: mesa-tracie-results
-  S3_TRACIE_PUBLIC_BUCKET: mesa-tracie-public
-  S3_TRACIE_PRIVATE_BUCKET: mesa-tracie-private
  # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
  # per-job artifact storage on MinIO
  JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
  # reference images stored for traces
-  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/${S3_TRACIE_RESULTS_BUCKET}/$FDO_UPSTREAM_REPO"
+  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
  # For individual CI farm status see .ci-farms folder
  # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
  # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
@@ -97,22 +87,15 @@ variables:
  ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
  # Python scripts for structured logger
  PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"
-  # Drop once deqp-runner is upgraded to > 0.18.0
-  MESA_VK_ABORT_ON_DEVICE_LOSS: 1
-  # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
-  MESA_SPIRV_LOG_LEVEL: error

 default:
-  id_tokens:
-    S3_JWT:
-      aud: https://s3.freedesktop.org
  before_script:
    - >
      export SCRIPTS_DIR=$(mktemp -d) &&
      curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" &&
      . ${SCRIPTS_DIR}/setup-test-env.sh &&
-      echo -n "${S3_JWT}" > "${S3_JWT_FILE}" &&
-      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables
+      echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}" &&
+      unset CI_JOB_JWT  # Unsetting vulnerable env variables

  after_script:
    # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
@@ -121,9 +104,9 @@ default:
    - >
      set +x

-      test -e "${S3_JWT_FILE}" &&
-      export S3_JWT="$(<${S3_JWT_FILE})" &&
-      rm "${S3_JWT_FILE}"
+      test -e "${CI_JOB_JWT_FILE}" &&
+      export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
+      rm "${CI_JOB_JWT_FILE}"

  # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports:
  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
@@ -177,7 +160,25 @@ include:
  - local: '.gitlab-ci/farm-rules.yml'
  - local: '.gitlab-ci/test-source-dep.yml'
  - local: 'docs/gitlab-ci.yml'
-  - local: 'src/**/ci/gitlab-ci.yml'
+  - local: 'src/amd/ci/gitlab-ci.yml'
+  - local: 'src/broadcom/ci/gitlab-ci.yml'
+  - local: 'src/etnaviv/ci/gitlab-ci.yml'
+  - local: 'src/freedreno/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/crocus/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/r300/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
+  - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
+  - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
+  - local: 'src/intel/ci/gitlab-ci.yml'
+  - local: 'src/microsoft/ci/gitlab-ci.yml'
+  - local: 'src/panfrost/ci/gitlab-ci.yml'
+  - local: 'src/virtio/ci/gitlab-ci.yml'


 # YAML anchors for rule conditions
@@ -276,7 +277,8 @@ make git archive:
    # compress the current folder
    - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .

-    - ci-fairy s3cp --token-file "${S3_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+

 # Sanity checks of MR settings and commit logs
 sanity:
@@ -292,32 +294,6 @@ sanity:
  script:
    # ci-fairy check-commits --junit-xml=check-commits.xml
    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
-    - |
-      set -eu
-      image_tags=(
-        DEBIAN_BASE_TAG
-        DEBIAN_BUILD_TAG
-        DEBIAN_TEST_ANDROID_TAG
-        DEBIAN_TEST_GL_TAG
-        DEBIAN_TEST_VK_TAG
-        ALPINE_X86_64_BUILD_TAG
-        ALPINE_X86_64_LAVA_SSH_TAG
-        FEDORA_X86_64_BUILD_TAG
-        KERNEL_ROOTFS_TAG
-        KERNEL_TAG
-        PKG_REPO_REV
-        WINDOWS_X64_MSVC_TAG
-        WINDOWS_X64_BUILD_TAG
-        WINDOWS_X64_TEST_TAG
-      )
-      for var in "${image_tags[@]}"
-      do
-        if [ "$(echo -n "${!var}" | wc -c)" -gt 20 ]
-        then
-          echo "$var is too long; please make sure it is at most 20 chars."
-          exit 1
-        fi
-      done
  artifacts:
    when: on_failure
    reports:
@@ -326,22 +302,6 @@ sanity:
    - placeholder-job


-mr-label-maker-test:
-  extends:
-    - .fdo.ci-fairy
-  stage: sanity
-  rules:
-    - !reference [.mr-label-maker-rules, rules]
-  variables:
-    GIT_STRATEGY: fetch
-  timeout: 10m
-  script:
-    - set -eu
-    - python3 -m venv .venv
-    - source .venv/bin/activate
-    - pip install git+https://gitlab.freedesktop.org/freedesktop/mr-label-maker
-    - mr-label-maker --dry-run --mr $CI_MERGE_REQUEST_IID
-
 # Jobs that need to pass before spending hardware resources on further testing
 .required-for-hardware-jobs:
  needs:
--- a/.gitlab-ci/all-skips.txt
+++ b/.gitlab-ci/all-skips.txt
@@ -9,9 +9,6 @@
 # submission, so skip it in the regular CI.
 dEQP-VK.api.driver_properties.conformance_version

-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
 # These are tremendously slow (pushing toward a minute), and aren't
 # reliable to be run in parallel with other tests due to CPU-side timing.
 dEQP-GLES[0-9]*.functional.flush_finish.*
--- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
@@ -5,25 +5,17 @@ target:
  id: '{{ ci_runner_id }}'

 timeouts:
-
  first_console_activity:  # This limits the time it can take to receive the first console log
-    minutes: {{ timeout_first_console_activity_minutes | default(0, true) }}
-    seconds: {{ timeout_first_console_activity_seconds | default(0, true) }}
-    retries: {{ timeout_first_console_activity_retries }}
-
+    minutes: {{ timeout_first_minutes }}
+    retries: {{ timeout_first_retries }}
  console_activity:        # Reset every time we receive a message from the logs
-    minutes: {{ timeout_console_activity_minutes | default(0, true) }}
-    seconds: {{ timeout_console_activity_seconds | default(0, true) }}
-    retries: {{ timeout_console_activity_retries }}
-
+    minutes: {{ timeout_minutes }}
+    retries: {{ timeout_retries }}
  boot_cycle:
-    minutes: {{ timeout_boot_minutes | default(0, true) }}
-    seconds: {{ timeout_boot_seconds | default(0, true) }}
+    minutes: {{ timeout_boot_minutes }}
    retries: {{ timeout_boot_retries }}
-
  overall:                 # Maximum time the job can take, not overrideable by the "continue" deployment
-    minutes: {{ timeout_overall_minutes | default(0, true) }}
-    seconds: {{ timeout_overall_seconds | default(0, true) }}
+    minutes: {{ timeout_overall_minutes }}
    retries: 0
    # no retries possible here

@@ -39,38 +31,29 @@ console_patterns:
    job_success:
        regex: >-
          {{ job_success_regex }}
-{% if job_warn_regex %}
    job_warn:
        regex: >-
          {{ job_warn_regex }}
-{% endif %}

 # Environment to deploy
 deployment:
  # Initial boot
  start:
-    storage:
-        http:
-          - path: "/b2c-extra-args"
-            data: >
-              b2c.pipefail b2c.poweroff_delay={{ poweroff_delay }}
-              b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
-              b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
-              {% for volume in volumes %}
-              b2c.volume={{ volume }}
-              {% endfor %}
-              b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
-              b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}"
    kernel:
      url: '{{ kernel_url }}'
-
-      # NOTE: b2c.cache_device should not be here, but this works around
-      # a limitation of b2c which will be removed in the next release
      cmdline: >
        SALAD.machine_id={{ '{{' }} machine_id }}
-        console={{ '{{' }} local_tty_device }},115200
-        b2c.cache_device=auto b2c.ntp_peer=10.42.0.1
-        b2c.extra_args_url={{ '{{' }} job.http.url }}/b2c-extra-args
+        console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep
+        loglevel={{ log_level }} no_hash_pointers
+        b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
+        b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check"
+        b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
+        b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
+        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
+{% for volume in volumes %}
+        b2c.volume={{ volume }}
+{% endfor %}
+        b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}"
        {% if kernel_cmdline_extras is defined %}
        {{ kernel_cmdline_extras }}
        {% endif %}
@@ -78,7 +61,3 @@ deployment:
    initramfs:
      url: '{{ initramfs_url }}'

-{% if dtb_url is defined %}
-    dtb:
-      url: '{{ dtb_url }}'
-{% endif %}
--- a/.gitlab-ci/bare-metal/poe-off
+++ b/.gitlab-ci/bare-metal/poe-off
@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
    exit 1
 fi

-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_OFF="i 2"

 flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"
--- a/.gitlab-ci/bare-metal/poe-on
+++ b/.gitlab-ci/bare-metal/poe-on
@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
    exit 1
 fi

-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_ON="i 1"
 SNMP_OFF="i 2"

--- a/.gitlab-ci/bare-metal/poe_run.py
+++ b/.gitlab-ci/bare-metal/poe_run.py
@@ -64,7 +64,7 @@ class PoERun:
        if not boot_detected:
            self.print_error(
                "Something wrong; couldn't detect the boot start up sequence")
-            return 2
+            return 1

        self.logger.create_job_phase("test")
        for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -13,7 +13,7 @@ date +'%F %T'

 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
-cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
+cp "${CI_JOB_JWT_FILE}" "${rootfs_dst}${CI_JOB_JWT_FILE}"

 date +'%F %T'

--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -17,6 +17,7 @@
    paths:
      - _build/meson-logs/*.txt
      - _build/meson-logs/strace
+      - shader-db
      - artifacts

 # Just Linux
@@ -70,15 +71,13 @@ debian-testing:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
      -D dri3=enabled
-      -D gallium-nine=true
      -D gallium-va=enabled
      -D gallium-rusticl=true
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,crocus,iris,i915,r300,svga"
-    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau"
+    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental"
    BUILDTYPE: "debugoptimized"
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
@@ -104,22 +103,8 @@ debian-testing-asan:
      -D b_sanitize=address
      -D valgrind=disabled
      -D tools=dlclose-skip
-      -D intel-clc=system
    S3_ARTIFACT_NAME: ""
    ARTIFACTS_DEBUG_SYMBOLS: 1
-    # Do a host build for intel-clc (asan complains not being loaded
-    # as the first library)
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D intel-clc=enabled
-      -D install-intel-clc=true

 debian-testing-msan:
  # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
@@ -131,32 +116,16 @@ debian-testing-msan:
    EXTRA_OPTION:
      -D b_sanitize=memory
      -D b_lundef=false
-      -D intel-clc=system
    S3_ARTIFACT_NAME: ""
    ARTIFACTS_DEBUG_SYMBOLS: 1
    # Don't run all the tests yet:
    # GLSL has some issues in sexpression reading.
    # gtest has issues in its test initialization.
    MESON_TEST_ARGS: "--suite glcpp --suite format"
-    GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
+    GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
    VULKAN_DRIVERS: intel,amd,broadcom,virtio
-    # Do a host build for intel-clc (msan complains about
-    # uninitialized values in the LLVM libs)
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D intel-clc=enabled
-      -D install-intel-clc=true

-# Disabled because it is unacceptably slow and blocks too many MRs
-# Should be re-enabled once this problem has been fixed.
-.debian-build-testing:
+debian-build-testing:
  extends: .meson-build
  variables:
    BUILDTYPE: debug
@@ -165,7 +134,6 @@ debian-testing-msan:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
      -D dri3=enabled
@@ -174,9 +142,9 @@ debian-testing-msan:
      -D gallium-omx=bellagio
      -D gallium-va=enabled
      -D gallium-xa=enabled
-      -D gallium-nine=false
+      -D gallium-nine=true
      -D gallium-rusticl=false
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
    VULKAN_DRIVERS: swrast
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
@@ -184,7 +152,6 @@ debian-testing-msan:
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
      -D b_lto=true
    LLVM_VERSION: 15
-    S3_ARTIFACT_NAME: debian-build-testing
  script: |
    section_start lava-pytest "lava-pytest"
    .gitlab-ci/lava/lava-pytest.sh
@@ -192,29 +159,11 @@ debian-testing-msan:
    .gitlab-ci/run-shellcheck.sh
    section_switch yamllint "yamllint"
    .gitlab-ci/run-yamllint.sh
-    section_end yamllint
+    section_switch meson "meson"
    .gitlab-ci/meson/build.sh
-    .gitlab-ci/prepare-artifacts.sh
-  timeout: 15m
-
-# Disabled because it currently needs debian-build-testing
-.shader-db:
-  stage: code-validation
-  extends:
-    - .use-debian/x86_64_build
-    - .container+build-rules
-  needs:
-    - .debian-build-testing
-  variables:
-    S3_ARTIFACT_NAME: debian-build-testing
-  before_script:
-    - !reference [.download_s3, before_script]
-  script: |
+    section_switch shader-db "shader-db"
    .gitlab-ci/run-shader-db.sh
-  artifacts:
-    paths:
-      - shader-db
-  timeout: 15m
+  timeout: 30m

 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -228,7 +177,6 @@ debian-release:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
      -D dri3=enabled
@@ -240,14 +188,13 @@ debian-release:
      -D gallium-nine=false
      -D gallium-rusticl=false
      -D llvm=enabled
-    GALLIUM_DRIVERS: "i915,iris,nouveau,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
    VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental"
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
      -D osmesa=true
      -D tools=all
      -D intel-clc=enabled
-      -D intel-rt=enabled
      -D imagination-srv=true
    BUILDTYPE: "release"
    S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
@@ -270,10 +217,10 @@ alpine-build-testing:
      -D glx=disabled
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
+      -D glvnd=false
      -D platforms=wayland
-    LLVM_VERSION: "16"
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
+    LLVM_VERSION: ""
+    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
    GALLIUM_ST: >
      -D dri3=enabled
      -D gallium-extra-hud=true
@@ -310,7 +257,7 @@ fedora-release:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=enabled
+      -D glvnd=true
      -D platforms=x11,wayland
    EXTRA_OPTION: >
      -D b_lto=true
@@ -318,10 +265,9 @@ fedora-release:
      -D selinux=true
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
      -D vulkan-layers=device-select,overlay
-      -D intel-rt=enabled
+      -D intel-clc=enabled
      -D imagination-srv=true
-      -D teflon=true
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
+    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
    GALLIUM_ST: >
      -D dri3=enabled
      -D gallium-extra-hud=true
@@ -363,7 +309,6 @@ debian-android:
      -D glx=disabled
      -D gbm=disabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=android
    EXTRA_OPTION: >
      -D android-stub=true
@@ -371,7 +316,6 @@ debian-android:
      -D platform-sdk-version=33
      -D valgrind=disabled
      -D android-libbacktrace=disabled
-      -D intel-clc=system
    GALLIUM_ST: >
      -D dri3=disabled
      -D gallium-vdpau=disabled
@@ -380,19 +324,8 @@ debian-android:
      -D gallium-xa=disabled
      -D gallium-nine=false
      -D gallium-rusticl=false
-    LLVM_VERSION: "15"
+    LLVM_VERSION: ""
    PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D intel-clc=enabled
-      -D install-intel-clc=true
    ARTIFACTS_DEBUG_SYMBOLS: 1
    S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
  script:
@@ -433,7 +366,7 @@ debian-android:
    - debian/arm64_build
  variables:
    VULKAN_DRIVERS: freedreno,broadcom
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
+    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4,zink"
    BUILDTYPE: "debugoptimized"
  tags:
    - aarch64
@@ -444,10 +377,6 @@ debian-arm32:
    - .ci-deqp-artifacts
  variables:
    CROSS: armhf
-    DRI_LOADERS:
-      -D glvnd=disabled
-    # remove llvmpipe from the .meson-arm list because here we have llvm=disabled
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
    EXTRA_OPTION: >
      -D llvm=disabled
      -D valgrind=disabled
@@ -463,8 +392,6 @@ debian-arm32-asan:
  extends:
    - debian-arm32
  variables:
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
      -D llvm=disabled
      -D b_sanitize=address
@@ -483,16 +410,12 @@ debian-arm64:
      -Wno-error=array-bounds
      -Wno-error=stringop-truncation
    VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
+      -D llvm=disabled
      -D valgrind=disabled
      -D imagination-srv=true
      -D perfetto=true
      -D freedreno-kmds=msm,virtio
-      -D teflon=true
-    GALLIUM_ST:
-      -D gallium-rusticl=true
    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
  script:
    - .gitlab-ci/meson/build.sh
@@ -502,9 +425,8 @@ debian-arm64-asan:
  extends:
    - debian-arm64
  variables:
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
+      -D llvm=disabled
      -D b_sanitize=address
      -D valgrind=disabled
      -D tools=dlclose-skip
@@ -518,8 +440,6 @@ debian-arm64-build-test:
    - .ci-deqp-artifacts
  variables:
    VULKAN_DRIVERS: "amd"
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
      -Dtools=panfrost,imagination

@@ -543,6 +463,7 @@ debian-clang:
    BUILDTYPE: debug
    LLVM_VERSION: 15
    UNWIND: "enabled"
+    GALLIUM_DUMP_CPU: "true"
    C_ARGS: >
      -Wno-error=constant-conversion
      -Wno-error=enum-conversion
@@ -558,7 +479,7 @@ debian-clang:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=enabled
+      -D glvnd=true
      -D platforms=x11,wayland
    GALLIUM_ST: >
      -D dri3=enabled
@@ -575,8 +496,8 @@ debian-clang:
      -D shared-llvm=enabled
      -D opencl-spirv=true
      -D shared-glapi=enabled
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau-experimental
    EXTRA_OPTION:
      -D spirv-to-dxil=true
      -D osmesa=true
@@ -585,9 +506,7 @@ debian-clang:
      -D vulkan-layers=device-select,overlay
      -D build-aco-tests=true
      -D intel-clc=enabled
-      -D intel-rt=enabled
      -D imagination-srv=true
-      -D teflon=true
    CC: clang-${LLVM_VERSION}
    CXX: clang++-${LLVM_VERSION}

@@ -640,7 +559,6 @@ debian-vulkan:
      -D opengl=false
      -D gles1=disabled
      -D gles2=disabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
      -D osmesa=false
    GALLIUM_ST: >
@@ -655,11 +573,11 @@ debian-vulkan:
      -D c_args=-fno-sanitize-recover=all
      -D cpp_args=-fno-sanitize-recover=all
    UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
+    VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,virtio,imagination-experimental,microsoft-experimental
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
      -D build-aco-tests=true
-      -D intel-rt=disabled
+      -D intel-clc=disabled
      -D imagination-srv=true

 debian-x86_32:
@@ -670,24 +588,10 @@ debian-x86_32:
    BUILDTYPE: debug
    CROSS: i386
    VULKAN_DRIVERS: intel,amd,swrast,virtio
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,llvmpipe,softpipe,virgl,zink,crocus,d3d12"
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
    LLVM_VERSION: 15
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
-      -D intel-clc=system
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D intel-clc=enabled
-      -D install-intel-clc=true

 debian-s390x:
  extends:
@@ -698,11 +602,9 @@ debian-s390x:
    - kvm
  variables:
    CROSS: s390x
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink"
+    GALLIUM_DRIVERS: "swrast,zink"
    LLVM_VERSION: 15
    VULKAN_DRIVERS: "swrast"
-    DRI_LOADERS:
-      -D glvnd=disabled

 debian-ppc64el:
  extends:
@@ -712,7 +614,5 @@ debian-ppc64el:
  variables:
    BUILDTYPE: debug
    CROSS: ppc64el
-    GALLIUM_DRIVERS: "nouveau,radeonsi,llvmpipe,softpipe,virgl,zink"
+    GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
    VULKAN_DRIVERS: "amd,swrast"
-    DRI_LOADERS:
-      -D glvnd=disabled
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -1,139 +1,130 @@
 #!/bin/bash

-VARS=(
-    ACO_DEBUG
-    ARTIFACTS_BASE_URL
-    ASAN_OPTIONS
-    BASE_SYSTEM_FORK_HOST_PREFIX
-    BASE_SYSTEM_MAINLINE_HOST_PREFIX
-    CI_COMMIT_BRANCH
-    CI_COMMIT_REF_NAME
-    CI_COMMIT_TITLE
-    CI_JOB_ID
-    S3_JWT_FILE
-    CI_JOB_STARTED_AT
-    CI_JOB_NAME
-    CI_JOB_URL
-    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    CI_MERGE_REQUEST_TITLE
-    CI_NODE_INDEX
-    CI_NODE_TOTAL
-    CI_PAGES_DOMAIN
-    CI_PIPELINE_ID
-    CI_PIPELINE_URL
-    CI_PROJECT_DIR
-    CI_PROJECT_NAME
-    CI_PROJECT_PATH
-    CI_PROJECT_ROOT_NAMESPACE
-    CI_RUNNER_DESCRIPTION
-    CI_SERVER_URL
-    CROSVM_GALLIUM_DRIVER
-    CROSVM_GPU_ARGS
-    CURRENT_SECTION
-    DEQP_BIN_DIR
-    DEQP_CONFIG
-    DEQP_EXPECTED_RENDERER
-    DEQP_FRACTION
-    DEQP_HEIGHT
-    DEQP_RESULTS_DIR
-    DEQP_RUNNER_OPTIONS
-    DEQP_SUITE
-    DEQP_TEMP_DIR
-    DEQP_VER
-    DEQP_WIDTH
-    DEVICE_NAME
-    DRIVER_NAME
-    EGL_PLATFORM
-    ETNA_MESA_DEBUG
-    FDO_CI_CONCURRENT
-    FDO_UPSTREAM_REPO
-    FD_MESA_DEBUG
-    FLAKES_CHANNEL
-    FREEDRENO_HANGCHECK_MS
-    GALLIUM_DRIVER
-    GALLIVM_PERF
-    GPU_VERSION
-    GTEST
-    GTEST_FAILS
-    GTEST_FRACTION
-    GTEST_RESULTS_DIR
-    GTEST_RUNNER_OPTIONS
-    GTEST_SKIPS
-    HWCI_FREQ_MAX
-    HWCI_KERNEL_MODULES
-    HWCI_KVM
-    HWCI_START_WESTON
-    HWCI_START_XORG
-    HWCI_TEST_SCRIPT
-    IR3_SHADER_DEBUG
-    JOB_ARTIFACTS_BASE
-    JOB_RESULTS_PATH
-    JOB_ROOTFS_OVERLAY_PATH
-    KERNEL_IMAGE_BASE
-    KERNEL_IMAGE_NAME
-    LD_LIBRARY_PATH
-    LIBGL_ALWAYS_SOFTWARE
-    LP_NUM_THREADS
-    MESA_BASE_TAG
-    MESA_BUILD_PATH
-    MESA_DEBUG
-    MESA_GLES_VERSION_OVERRIDE
-    MESA_GLSL_VERSION_OVERRIDE
-    MESA_GL_VERSION_OVERRIDE
-    MESA_IMAGE
-    MESA_IMAGE_PATH
-    MESA_IMAGE_TAG
-    MESA_LOADER_DRIVER_OVERRIDE
-    MESA_SPIRV_LOG_LEVEL
-    MESA_TEMPLATES_COMMIT
-    MESA_VK_ABORT_ON_DEVICE_LOSS
-    MESA_VK_IGNORE_CONFORMANCE_WARNING
-    S3_HOST
-    S3_RESULTS_UPLOAD
-    NIR_DEBUG
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
-    PAN_MESA_DEBUG
-    PANVK_DEBUG
-    PIGLIT_FRACTION
-    PIGLIT_NO_WINDOW
-    PIGLIT_OPTIONS
-    PIGLIT_PLATFORM
-    PIGLIT_PROFILES
-    PIGLIT_REPLAY_ANGLE_TAG
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL
-    PIGLIT_REPLAY_DEVICE_NAME
-    PIGLIT_REPLAY_EXTRA_ARGS
-    PIGLIT_REPLAY_LOOP_TIMES
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE
-    PIGLIT_REPLAY_SUBCOMMAND
-    PIGLIT_RESULTS
-    PIGLIT_TESTS
-    PIGLIT_TRACES_FILE
-    PIPELINE_ARTIFACTS_BASE
-    RADEON_DEBUG
-    RADV_DEBUG
-    RADV_PERFTEST
-    SKQP_ASSETS_DIR
-    SKQP_BACKENDS
-    TU_DEBUG
-    USE_ANGLE
-    VIRGL_HOST_API
-    VIRGL_RENDER_SERVER
-    WAFFLE_PLATFORM
-    VK_DRIVER
-    VKD3D_PROTON_RESULTS
-    VKD3D_CONFIG
-    VKD3D_TEST_EXCLUDE
-    ZINK_DESCRIPTORS
-    ZINK_DEBUG
-    LVP_POISON_MEMORY
-
-    # Dead code within Mesa CI, but required by virglrender CI
-    # (because they include our files in their CI)
-    VK_DRIVER_FILES
-)
-
-for var in "${VARS[@]}"; do
+for var in \
+    ACO_DEBUG \
+    ARTIFACTS_BASE_URL \
+    ASAN_OPTIONS \
+    BASE_SYSTEM_FORK_HOST_PREFIX \
+    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
+    CI_COMMIT_BRANCH \
+    CI_COMMIT_REF_NAME \
+    CI_COMMIT_TITLE \
+    CI_JOB_ID \
+    CI_JOB_JWT_FILE \
+    CI_JOB_STARTED_AT \
+    CI_JOB_NAME \
+    CI_JOB_URL \
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
+    CI_MERGE_REQUEST_TITLE \
+    CI_NODE_INDEX \
+    CI_NODE_TOTAL \
+    CI_PAGES_DOMAIN \
+    CI_PIPELINE_ID \
+    CI_PIPELINE_URL \
+    CI_PROJECT_DIR \
+    CI_PROJECT_NAME \
+    CI_PROJECT_PATH \
+    CI_PROJECT_ROOT_NAMESPACE \
+    CI_RUNNER_DESCRIPTION \
+    CI_SERVER_URL \
+    CROSVM_GALLIUM_DRIVER \
+    CROSVM_GPU_ARGS \
+    CURRENT_SECTION \
+    DEQP_BIN_DIR \
+    DEQP_CONFIG \
+    DEQP_EXPECTED_RENDERER \
+    DEQP_FRACTION \
+    DEQP_HEIGHT \
+    DEQP_RESULTS_DIR \
+    DEQP_RUNNER_OPTIONS \
+    DEQP_SUITE \
+    DEQP_TEMP_DIR \
+    DEQP_VARIANT \
+    DEQP_VER \
+    DEQP_WIDTH \
+    DEVICE_NAME \
+    DRIVER_NAME \
+    EGL_PLATFORM \
+    ETNA_MESA_DEBUG \
+    FDO_CI_CONCURRENT \
+    FDO_UPSTREAM_REPO \
+    FD_MESA_DEBUG \
+    FLAKES_CHANNEL \
+    FREEDRENO_HANGCHECK_MS \
+    GALLIUM_DRIVER \
+    GALLIVM_PERF \
+    GPU_VERSION \
+    GTEST \
+    GTEST_FAILS \
+    GTEST_FRACTION \
+    GTEST_RESULTS_DIR \
+    GTEST_RUNNER_OPTIONS \
+    GTEST_SKIPS \
+    HWCI_FREQ_MAX \
+    HWCI_KERNEL_MODULES \
+    HWCI_KVM \
+    HWCI_START_WESTON \
+    HWCI_START_XORG \
+    HWCI_TEST_SCRIPT \
+    IR3_SHADER_DEBUG \
+    JOB_ARTIFACTS_BASE \
+    JOB_RESULTS_PATH \
+    JOB_ROOTFS_OVERLAY_PATH \
+    KERNEL_IMAGE_BASE \
+    KERNEL_IMAGE_NAME \
+    LD_LIBRARY_PATH \
+    LP_NUM_THREADS \
+    MESA_BASE_TAG \
+    MESA_BUILD_PATH \
+    MESA_DEBUG \
+    MESA_GLES_VERSION_OVERRIDE \
+    MESA_GLSL_VERSION_OVERRIDE \
+    MESA_GL_VERSION_OVERRIDE \
+    MESA_IMAGE \
+    MESA_IMAGE_PATH \
+    MESA_IMAGE_TAG \
+    MESA_LOADER_DRIVER_OVERRIDE \
+    MESA_TEMPLATES_COMMIT \
+    MESA_VK_IGNORE_CONFORMANCE_WARNING \
+    S3_HOST \
+    S3_RESULTS_UPLOAD \
+    NIR_DEBUG \
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
+    PAN_MESA_DEBUG \
+    PANVK_DEBUG \
+    PIGLIT_FRACTION \
+    PIGLIT_NO_WINDOW \
+    PIGLIT_OPTIONS \
+    PIGLIT_PLATFORM \
+    PIGLIT_PROFILES \
+    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
+    PIGLIT_REPLAY_DEVICE_NAME \
+    PIGLIT_REPLAY_EXTRA_ARGS \
+    PIGLIT_REPLAY_LOOP_TIMES \
+    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
+    PIGLIT_REPLAY_SUBCOMMAND \
+    PIGLIT_RESULTS \
+    PIGLIT_TESTS \
+    PIGLIT_TRACES_FILE \
+    PIPELINE_ARTIFACTS_BASE \
+    RADEON_DEBUG \
+    RADV_DEBUG \
+    RADV_PERFTEST \
+    SKQP_ASSETS_DIR \
+    SKQP_BACKENDS \
+    TU_DEBUG \
+    USE_ANGLE \
+    VIRGL_HOST_API \
+    WAFFLE_PLATFORM \
+    VK_CPU \
+    VK_DRIVER \
+    VK_ICD_FILENAMES \
+    VKD3D_PROTON_RESULTS \
+    VKD3D_CONFIG \
+    ZINK_DESCRIPTORS \
+    ZINK_DEBUG \
+    LVP_POISON_MEMORY \
+    ; do
  if [ -n "${!var+x}" ]; then
    echo "export $var=${!var@Q}"
  fi
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -7,8 +7,6 @@
 # Second-stage init, used to set up devices and our job environment before
 # running tests.

-shopt -s extglob
-
 # Make sure to kill itself and all the children process from this script on
 # exiting, since any console output may interfere with LAVA signals handling,
 # which based on the log console.
@@ -108,13 +106,6 @@ export XDG_CACHE_HOME=/tmp
 # Make sure Python can find all our imports
 export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")

-# If we need to specify a driver, it means several drivers could pick up this gpu;
-# ensure that the other driver can't accidentally be used
-if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
-  rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
-fi
-ls -1 /install/lib/dri/*_dri.so || true
-
 if [ "$HWCI_FREQ_MAX" = "true" ]; then
  # Ensure initialization of the DRM device (needed by MSM)
  head -0 /dev/dri/renderD128
@@ -158,9 +149,6 @@ if [ -x /capture-devcoredump.sh ]; then
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 fi

-ARCH=$(uname -m)
-export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-
 # If we want Xorg to be running for the test, then we start it up before the
 # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
 # without using -displayfd you can race with Xorg's startup), but xinit will eat
@@ -168,6 +156,7 @@ export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 if [ -n "$HWCI_START_XORG" ]; then
  echo "touch /xorg-started; sleep 100000" > /xorg-script
  env \
+    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"

@@ -194,6 +183,7 @@ if [ -n "$HWCI_START_WESTON" ]; then
  mkdir -p /tmp/.X11-unix

  env \
+    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"

@@ -218,7 +208,7 @@ cleanup
 # upload artifacts
 if [ -n "$S3_RESULTS_UPLOAD" ]; then
  tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
+  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
 fi

 # We still need to echo the hwci: mesa message, as some scripts rely on it, such
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -8,8 +8,6 @@
 set -e
 set -o xtrace

-export LLVM_VERSION="${LLVM_VERSION:=16}"
-
 EPHEMERAL=(
 )

@@ -18,7 +16,6 @@ DEPS=(
    bash
    bison
    ccache
-    "clang${LLVM_VERSION}-dev"
    cmake
    clang-dev
    coreutils
@@ -29,13 +26,9 @@ DEPS=(
    git
    gettext
    glslang
-    graphviz
    linux-headers
-    "llvm${LLVM_VERSION}-static"
-    "llvm${LLVM_VERSION}-dev"
+    llvm16-dev
    meson
-    mold
-    musl-dev
    expat-dev
    elfutils-dev
    libdrm-dev
@@ -44,13 +37,8 @@ DEPS=(
    libpciaccess-dev
    zlib-dev
    python3-dev
-    py3-clang
-    py3-cparser
    py3-mako
-    py3-packaging
-    py3-pip
    py3-ply
-    py3-yaml
    vulkan-headers
    spirv-tools-dev
    util-macros
@@ -60,12 +48,6 @@ DEPS=(

 apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"

-pip3 install --break-system-packages sphinx===5.1.1 hawkmoth===0.16.0
-
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
 . .gitlab-ci/container/container_pre_build.sh


--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -1,12 +1,8 @@
 #!/usr/bin/env bash

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# KERNEL_ROOTFS_TAG
-
 set -ex

-ANGLE_REV="1409a05a81e3ccb279142433a2b987bc330f555b"
+ANGLE_REV="0518a3ff4d4e7e5b2ce8203358f719613a31c118"

 # DEPOT tools
 git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -3,8 +3,8 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

 set -ex
--- a/.gitlab-ci/container/build-bindgen.sh
+++ b/.gitlab-ci/container/build-bindgen.sh
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-BINDGEN_VER=0.65.1
-CBINDGEN_VER=0.26.0
-
-# bindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  bindgen-cli --version ${BINDGEN_VER} \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local
-
-# cbindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  cbindgen --version ${CBINDGEN_VER} \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local
-
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -6,13 +6,13 @@ set -ex
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"

-CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
+CROSVM_VERSION=e3815e62d675ef436956a992e0ed58b7309c759d
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init

-VIRGLRENDERER_VERSION=d9c002fac153b834a2c17731f2b85c36e333e102
+VIRGLRENDERER_VERSION=747c6ae5b194ca551a79958a9a86c42bddcc4553
 rm -rf third_party/virglrenderer
 git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
@@ -31,10 +31,10 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  --version 0.65.1 \
  $EXTRA_CARGO_ARGS

-CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  -j ${FDO_CI_CONCURRENT:-4} \
  --locked \
-  --features 'default-no-sandbox gpu x virgl_renderer' \
+  --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
  --path . \
  --root /usr/local \
  $EXTRA_CARGO_ARGS
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -3,37 +3,29 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_BASE_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
 # KERNEL_ROOTFS_TAG

 set -ex

-DEQP_RUNNER_VERSION=0.18.0
-
-DEQP_RUNNER_GIT_URL="${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/mesa/deqp-runner.git}"
-
 if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
    # Build and install from source
-    DEQP_RUNNER_CARGO_ARGS="--git $DEQP_RUNNER_GIT_URL"
+    DEQP_RUNNER_CARGO_ARGS="--git ${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/anholt/deqp-runner.git}"

    if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
        DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
-        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
    else
        DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
-        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
    fi

    DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
    # Install from package registry
-    DEQP_RUNNER_CARGO_ARGS="--version ${DEQP_RUNNER_VERSION} ${EXTRA_CARGO_ARGS} -- deqp-runner"
-    DEQP_RUNNER_GIT_CHECKOUT="v$DEQP_RUNNER_VERSION"
+    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
 fi

-if [[ "$RUST_TARGET" != *-android ]]; then
+if [ -z "$ANDROID_NDK_HOME" ]; then
    cargo install --locked  \
        -j ${FDO_CI_CONCURRENT:-4} \
        --root /usr/local \
@@ -41,7 +33,7 @@ if [[ "$RUST_TARGET" != *-android ]]; then
 else
    mkdir -p /deqp-runner
    pushd /deqp-runner
-    git clone --branch "$DEQP_RUNNER_GIT_CHECKOUT" --depth 1 "$DEQP_RUNNER_GIT_URL" deqp-runner-git
+    git clone --branch v0.18.0 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git
    pushd deqp-runner-git

    cargo install --locked  \
@@ -49,10 +41,10 @@ else
        --root /usr/local --version 2.10.0 \
        cargo-ndk

-    rustup target add $RUST_TARGET
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
+    rustup target add x86_64-linux-android
+    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target x86_64-linux-android build

-    mv target/$RUST_TARGET/release/deqp-runner /deqp-runner
+    mv target/x86_64-linux-android/debug/deqp-runner /deqp-runner

    cargo uninstall --locked  \
        --root /usr/local \
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -3,97 +3,17 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

 set -ex -o pipefail

-# See `deqp_build_targets` below for which release is used to produce which
-# binary. Unless this comment has bitrotten:
-# - the VK release produces `deqp-vk`,
-# - the GL release produces `glcts`, and
-# - the GLES release produces `deqp-gles*` and `deqp-egl`
-
-DEQP_VK_VERSION=1.3.8.2
-DEQP_GL_VERSION=4.6.4.1
-DEQP_GLES_VERSION=3.2.10.1
-
-# Patches to VulkanCTS may come from commits in their repo (listed in
-# cts_commits_to_backport) or patch files stored in our repo (in the patch
-# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
-# Both list variables would have comments explaining the reasons behind the
-# patches.
-
-# shellcheck disable=SC2034
-vk_cts_commits_to_backport=(
-    # Fix more ASAN errors due to missing virtual destructors
-    dd40bcfef1b4035ea55480b6fd4d884447120768
-
-    # Remove "unused shader stages" tests
-    7dac86c6bbd15dec91d7d9a98cd6dd57c11092a7
-
-    # Emit point size from "many indirect draws" test
-    771e56d1c4d03e073ddb7f1200ad6d57e0a0c979
-)
-
-# shellcheck disable=SC2034
-vk_cts_patch_files=(
-)
-
-if [ "${DEQP_TARGET}" = 'android' ]; then
-  vk_cts_patch_files+=(
-    build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
-    build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
-  )
-fi
-
-# shellcheck disable=SC2034
-gl_cts_commits_to_backport=(
-)
-
-# shellcheck disable=SC2034
-gl_cts_patch_files=(
-)
-
-if [ "${DEQP_TARGET}" = 'android' ]; then
-  gl_cts_patch_files+=(
-    build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
-    build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
-  )
-fi
-
-# shellcheck disable=SC2034
-# GLES builds also EGL
-gles_cts_commits_to_backport=(
-)
-
-# shellcheck disable=SC2034
-gles_cts_patch_files=(
-)
-
-if [ "${DEQP_TARGET}" = 'android' ]; then
-  gles_cts_patch_files+=(
-    build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
-    build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch
-  )
-fi
-
-
-### Careful editing anything below this line
-
+DEQP_VERSION=vulkan-cts-1.3.7.0

 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
-
-# shellcheck disable=SC2153
-case "${DEQP_API}" in
-  VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";;
-  GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";;
-  GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";;
-esac
-
 git clone \
    https://github.com/KhronosGroup/VK-GL-CTS.git \
    -b $DEQP_VERSION \
@@ -103,30 +23,50 @@ pushd /VK-GL-CTS

 mkdir -p /deqp

-# shellcheck disable=SC2153
-deqp_api=${DEQP_API,,}
+echo "dEQP base version $DEQP_VERSION" > /deqp/version-log

-cts_commits_to_backport="${deqp_api}_cts_commits_to_backport[@]"
-for commit in "${!cts_commits_to_backport}"
+# Patches to VulkanCTS may come from commits in their repo (listed in
+# cts_commits_to_backport) or patch files stored in our repo (in the patch
+# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
+# Both list variables would have comments explaining the reasons behind the
+# patches.
+
+cts_commits_to_backport=(
+    # Take multiview into account for task shader inv. stats
+    22aa3f4c59f6e1d4daebd5a8c9c05bce6cd3b63b
+
+    # Remove illegal mesh shader query tests
+    2a87f7b25dc27188be0f0a003b2d7aef69d9002e
+
+    # Relax fragment shader invocations result verifications
+    0d8bf6a2715f95907e9cf86a86876ff1f26c66fe
+
+    # Fix several issues in dynamic rendering basic tests
+    c5453824b498c981c6ba42017d119f5de02a3e34
+)
+
+for commit in "${cts_commits_to_backport[@]}"
 do
  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
-  echo "Apply patch to ${DEQP_API} CTS from $PATCH_URL"
+  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
    git am -
 done

-cts_patch_files="${deqp_api}_cts_patch_files[@]"
-for patch in "${!cts_patch_files}"
+cts_patch_files=(
+  # Android specific patches.
+  build-deqp_Allow-running-on-Android-from-the-command-line.patch
+  build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
+)
+
+for patch in "${cts_patch_files[@]}"
 do
-  echo "Apply patch to ${DEQP_API} CTS from $patch"
+  echo "Apply patch to VK-GL-CTS from $patch"
  git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done

-{
-  echo "dEQP base version $DEQP_VERSION"
-  echo "The following local patches are applied on top:"
-  git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /'
-} > /deqp/version-$deqp_api
+echo "The following local patches are applied on top:" >> /deqp/version-log
+git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /' >> /deqp/version-log

 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
@@ -139,97 +79,57 @@ popd

 pushd /deqp

-if [ "${DEQP_API}" = 'GLES' ]; then
-  if [ "${DEQP_TARGET}" = 'android' ]; then
-    cmake -S /VK-GL-CTS -B . -G Ninja \
-        -DDEQP_TARGET=android \
-        -DCMAKE_BUILD_TYPE=Release \
-        $EXTRA_CMAKE_ARGS
-    mold --run ninja modules/egl/deqp-egl
-    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
-  else
+if [ "${DEQP_TARGET}" != 'android' ]; then
    # When including EGL/X11 testing, do that build first and save off its
    # deqp-egl binary.
    cmake -S /VK-GL-CTS -B . -G Ninja \
        -DDEQP_TARGET=x11_egl_glx \
        -DCMAKE_BUILD_TYPE=Release \
        $EXTRA_CMAKE_ARGS
-    mold --run ninja modules/egl/deqp-egl
+    ninja modules/egl/deqp-egl
    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11

    cmake -S /VK-GL-CTS -B . -G Ninja \
        -DDEQP_TARGET=wayland \
        -DCMAKE_BUILD_TYPE=Release \
        $EXTRA_CMAKE_ARGS
-    mold --run ninja modules/egl/deqp-egl
+    ninja modules/egl/deqp-egl
    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
-  fi
 fi

 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET} \
+      -DDEQP_TARGET=${DEQP_TARGET:-default} \
      -DCMAKE_BUILD_TYPE=Release \
      $EXTRA_CMAKE_ARGS
+mold --run ninja

-# Make sure `default` doesn't silently stop detecting one of the platforms we care about
-if [ "${DEQP_TARGET}" = 'default' ]; then
-  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
-  grep -q DEQP_SUPPORT_X11=1 build.ninja
-  grep -q DEQP_SUPPORT_XCB=1 build.ninja
+if [ "${DEQP_TARGET}" = 'android' ]; then
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
 fi

-deqp_build_targets=()
-case "${DEQP_API}" in
-  VK)
-    deqp_build_targets+=(deqp-vk)
-    ;;
-  GL)
-    deqp_build_targets+=(glcts)
-    ;;
-  GLES)
-    deqp_build_targets+=(deqp-gles{2,3,31})
-    # deqp-egl also comes from this build, but it is handled separately above.
-    ;;
-esac
-if [ "${DEQP_TARGET}" != 'android' ]; then
-  deqp_build_targets+=(testlog-to-xml)
-  deqp_build_targets+=(testlog-to-csv)
-  deqp_build_targets+=(testlog-to-junit)
-fi
-
-mold --run ninja "${deqp_build_targets[@]}"
+# Copy out the mustpass lists we want.
+mkdir /deqp/mustpass
+for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
+    cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
+        >> /deqp/mustpass/vk-master.txt
+done

 if [ "${DEQP_TARGET}" != 'android' ]; then
-    # Copy out the mustpass lists we want.
-    mkdir -p /deqp/mustpass
-
-    if [ "${DEQP_API}" = 'VK' ]; then
-        for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
-            cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
-                >> /deqp/mustpass/vk-main.txt
-        done
-    fi
-
-    if [ "${DEQP_API}" = 'GL' ]; then
-        cp \
-            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-main.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
-            /deqp/mustpass/
-    fi
-
-    if [ "${DEQP_API}" = 'GLES' ]; then
-        cp \
-            /VK-GL-CTS/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-main.txt \
-            /deqp/mustpass/
-    fi
+    cp \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
+        /deqp/mustpass/.
+    cp \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \
+        /deqp/mustpass/.
+    cp \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-master.txt \
+        /deqp/mustpass/.
+    cp \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
+        /deqp/mustpass/.
+    cp \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
+        /deqp/mustpass/.

    # Save *some* executor utils, but otherwise strip things down
    # to reduct deqp build size:
@@ -240,8 +140,8 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 fi

 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf /deqp/external/**/mustpass/
-rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
+rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master*
 rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default

 rm -rf /deqp/external/openglcts/modules/cts-runner
@@ -249,15 +149,9 @@ rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
 rm -rf /deqp/framework
 find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
-if [ "${DEQP_API}" = 'VK' ]; then
-  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
-fi
-if [ "${DEQP_API}" = 'GL' ]; then
-  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
-fi
-if [ "${DEQP_API}" = 'GLES' ]; then
-  ${STRIP_CMD:-strip} modules/*/deqp-*
-fi
+${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
+${STRIP_CMD:-strip} external/openglcts/modules/glcts
+${STRIP_CMD:-strip} modules/*/deqp-*
 du -sh ./*
 rm -rf /VK-GL-CTS
 popd
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -7,7 +7,7 @@

 set -ex

-git clone https://github.com/microsoft/DirectX-Headers -b v1.613.1 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
 meson install -C build
--- a/.gitlab-ci/container/build-fossilize.sh
+++ b/.gitlab-ci/container/build-fossilize.sh
@@ -2,7 +2,7 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

 set -ex
--- a/.gitlab-ci/container/download-prebuilt-kernel.sh
+++ b/.gitlab-ci/container/download-prebuilt-kernel.sh
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
-# Script used for Android and Fedora builds (Debian builds get their libdrm version
-# from https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo - see PKG_REPO_REV)
+# Script used for Android and Fedora builds
 # shellcheck disable=SC2086 # we want word splitting

 set -ex

-export LIBDRM_VERSION=libdrm-2.4.122
+export LIBDRM_VERSION=libdrm-2.4.119

 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
    https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@@ -2,15 +2,7 @@

 set -ex

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
-# DEBIAN_BUILD_TAG
-# FEDORA_X86_64_BUILD_TAG
-# KERNEL_ROOTFS_TAG
-
-MOLD_VERSION="2.32.0"
+MOLD_VERSION="1.11.0"

 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold
--- a/.gitlab-ci/container/build-ninetests.sh
+++ b/.gitlab-ci/container/build-ninetests.sh
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-
-set -ex -o pipefail
-
-### Careful editing anything below this line
-
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-git clone https://github.com/axeldavy/Xnine.git /Xnine
-mkdir /Xnine/build
-pushd /Xnine/build
-git checkout c64753d224c08006bcdcfa7880ada826f27164b1
-
-cmake .. -DBUILD_TESTS=1 -DWITH_DRI3=1 -DD3DADAPTER9_LOCATION=/install/lib/d3d/d3dadapter9.so
-make
-
-mkdir -p /NineTests/
-mv NineTests/NineTests /NineTests/
-
-popd
-rm -rf /Xnine
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -4,11 +4,11 @@ set -ex

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-REV="582f5490a124c27c26d3a452fee03a8c85fa9a5c"
+REV="f7db20b03de6896d013826c0a731bc4417c1a5a0"

 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -2,11 +2,11 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 set -ex

-VKD3D_PROTON_COMMIT="3d46c082906c77544385d10801e4c0184f0385d9"
+VKD3D_PROTON_COMMIT="a0ccc383937903f4ca0997ce53e41ccce7f2f2ec"

 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ b/.gitlab-ci/container/build-vulkan-validation.sh
@@ -2,12 +2,12 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# KERNEL_ROOTFS_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# KERNEL_ROOTFS_TAG:

 set -ex

-VALIDATION_TAG="v1.3.289"
+VALIDATION_TAG="v1.3.269"

 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -3,17 +3,8 @@

 set -ex

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# FEDORA_X86_64_BUILD_TAG
-# KERNEL_ROOTFS_TAG
-
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.34"
+export WAYLAND_PROTOCOLS_VERSION="1.31"

 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
--- a/.gitlab-ci/container/create-android-cross-file.sh
+++ b/.gitlab-ci/container/create-android-cross-file.sh
@@ -22,7 +22,7 @@ cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_v
 c_ld = 'lld'
 cpp_ld = 'lld'
 strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
-pkg-config = ['/usr/bin/pkgconf']
+pkgconfig = ['/usr/bin/pkgconf']

 [host_machine]
 system = 'android'
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -52,8 +52,7 @@ if [[ $arch != "armhf" ]]; then
    # We don't need clang-format for the crossbuilds, but the installed amd64
    # package will conflict with libclang. Uninstall clang-format (and its
    # problematic dependency) to fix.
-    apt-get remove -y "clang-format-${LLVM_VERSION}" "libclang-cpp${LLVM_VERSION}" \
-            "llvm-${LLVM_VERSION}-runtime" "llvm-${LLVM_VERSION}-linker-tools"
+    apt-get remove -y "clang-format-${LLVM_VERSION}" "libclang-cpp${LLVM_VERSION}"

    # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
    # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
--- a/.gitlab-ci/container/debian/arm32_test.sh
+++ b/.gitlab-ci/container/debian/arm32_test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+arch=armhf . .gitlab-ci/container/debian/arm_test.sh
--- a/.gitlab-ci/container/debian/arm64_build.sh
+++ b/.gitlab-ci/container/debian/arm64_build.sh
@@ -26,23 +26,16 @@ DEPS=(
    ccache
    cmake
    curl
-    "clang-${LLVM_VERSION}"
    fastboot
-    flatbuffers-compiler
    flex
    g++
    git
    glslang-tools
    kmod
-    "libclang-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-common-${LLVM_VERSION}-dev"
    libasan8
    libdrm-dev
    libelf-dev
    libexpat1-dev
-    libflatbuffers-dev
-    "libllvm${LLVM_VERSION}"
    libvulkan-dev
    libx11-dev
    libx11-xcb-dev
@@ -57,7 +50,6 @@ DEPS=(
    libxext-dev
    libxrandr-dev
    libxshmfence-dev
-    libxtensor-dev
    libxxf86vm-dev
    libwayland-dev
    libwayland-egl-backend-dev
@@ -69,7 +61,6 @@ DEPS=(
    python3-mako
    python3-pil
    python3-pip
-    python3-pycparser
    python3-requests
    python3-setuptools
    u-boot-tools
@@ -91,16 +82,6 @@ arch=armhf

 . .gitlab-ci/container/build-wayland.sh

-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
-. .gitlab-ci/container/install-meson.sh
-
-. .gitlab-ci/container/build-rust.sh
-
-. .gitlab-ci/container/build-bindgen.sh
-
 apt-get purge -y "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/arm64_test-base.sh
+++ b/.gitlab-ci/container/debian/arm64_test-base.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=arm64 \
-. .gitlab-ci/container/debian/test-base.sh
--- a/.gitlab-ci/container/debian/arm64_test-gl.sh
+++ b/.gitlab-ci/container/debian/arm64_test-gl.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-. .gitlab-ci/container/debian/test-gl.sh
--- a/.gitlab-ci/container/debian/arm64_test-vk.sh
+++ b/.gitlab-ci/container/debian/arm64_test-vk.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-. .gitlab-ci/container/debian/test-vk.sh
--- a/.gitlab-ci/container/debian/arm64_test.sh
+++ b/.gitlab-ci/container/debian/arm64_test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+arch=arm64 . .gitlab-ci/container/debian/arm_test.sh
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh
--- a/.gitlab-ci/container/debian/baremetal_arm32_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm32_test.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=armhf . .gitlab-ci/container/debian/baremetal_arm_test.sh
--- a/.gitlab-ci/container/debian/baremetal_arm64_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm64_test.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y ca-certificates gnupg2 software-properties-common
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
-
-echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
-
-export LLVM_VERSION="${LLVM_VERSION:=15}"
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    autoconf
-    automake
-    bc
-    bison
-    bzip2
-    ccache
-    cmake
-    "clang-${LLVM_VERSION}"
-    dpkg-dev
-    flex
-    glslang-tools
-    g++
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    libdrm-dev
-    libegl-dev
-    libelf-dev
-    libepoxy-dev
-    libgbm-dev
-    libpciaccess-dev
-    libssl-dev
-    libvulkan-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxext-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    openssh-server
-    patch
-    pkgconf
-    protobuf-compiler
-    python3-dev
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    spirv-tools
-    wayland-protocols
-    xz-utils
-)
-
-DEPS=(
-    apt-utils
-    curl
-    git
-    git-lfs
-    inetutils-syslogd
-    iptables
-    jq
-    libasan8
-    libdrm2
-    libexpat1
-    "libllvm${LLVM_VERSION}"
-    liblz4-1
-    libpng16-16
-    libpython3.11
-    libvulkan1
-    libwayland-client0
-    libwayland-server0
-    libxcb-ewmh2
-    libxcb-randr0
-    libxcb-xfixes0
-    libxkbcommon0
-    libxrandr2
-    libxrender1
-    python3-mako
-    python3-numpy
-    python3-packaging
-    python3-pil
-    python3-requests
-    python3-six
-    python3-yaml
-    socat
-    vulkan-tools
-    waffle-utils
-    xauth
-    xvfb
-    zlib1g
-    zstd
-)
-
-apt-get update
-apt-get dist-upgrade -y
-
-apt-get install --purge -y \
-      sysvinit-core libelogind0
-
-apt-get install -y --no-remove "${DEPS[@]}"
-
-apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Download prebuilt kernel
-
-if [ "$DEBIAN_ARCH" = amd64 ]; then
-  export KERNEL_IMAGE_NAME=bzImage
-
-  mkdir -p /lava-files/
-  . .gitlab-ci/container/download-prebuilt-kernel.sh
-fi
-
-# Needed for ci-fairy, this revision is able to upload files to MinIO
-# and doesn't depend on git
-pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# Needed for manipulation with traces yaml files.
-pip3 install --break-system-packages yq
-
-. .gitlab-ci/container/build-mold.sh
-
-############### Build LLVM-SPIRV translator
-
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-############### Build libclc
-
-. .gitlab-ci/container/build-libclc.sh
-
-############### Build Wayland
-
-. .gitlab-ci/container/build-wayland.sh
-
-############### Build Crosvm
-
-. .gitlab-ci/container/build-rust.sh
-. .gitlab-ci/container/build-crosvm.sh
-
-############### Build dEQP runner
-. .gitlab-ci/container/build-deqp-runner.sh
-
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-rm -rf /root/.rustup
-
-. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-export LLVM_VERSION="${LLVM_VERSION:=15}"
-
-apt-get install -y libelogind0  # this interfere with systemd deps, install separately
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    bzip2
-    ccache
-    "clang-${LLVM_VERSION}"
-    cmake
-    dpkg-dev
-    g++
-    glslang-tools
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    libdrm-dev
-    libgles2-mesa-dev
-    libgtest-dev
-    libpciaccess-dev
-    libpng-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-present-dev
-    libxfixes-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    ocl-icd-opencl-dev
-    patch
-    pkgconf
-    python3-distutils
-    xz-utils
-)
-
-DEPS=(
-    clinfo
-    iptables
-    kmod
-    "libclang-common-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}"
-    libcap2
-    libegl1
-    libepoxy0
-    libfdt1
-    libxcb-shm0
-    ocl-icd-libopencl1
-    python3-lxml
-    python3-renderdoc
-    python3-simplejson
-    spirv-tools
-    sysvinit-core
-    weston
-    xwayland
-)
-
-apt-get update
-
-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-      $EXTRA_LOCAL_PACKAGES
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Build piglit
-
-PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-	     -DPIGLIT_USE_GBM=ON
-	     -DPIGLIT_USE_WAYLAND=ON
-	     -DPIGLIT_USE_X11=ON
-	     -DPIGLIT_BUILD_GLX_TESTS=ON
-	     -DPIGLIT_BUILD_EGL_TESTS=ON
-	     -DPIGLIT_BUILD_WGL_TESTS=OFF
-	     -DPIGLIT_BUILD_GL_TESTS=ON
-	     -DPIGLIT_BUILD_GLES1_TESTS=ON
-	     -DPIGLIT_BUILD_GLES2_TESTS=ON
-	     -DPIGLIT_BUILD_GLES3_TESTS=ON
-	     -DPIGLIT_BUILD_CL_TESTS=ON
-	     -DPIGLIT_BUILD_VK_TESTS=ON
-	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
-  . .gitlab-ci/container/build-piglit.sh
-
-############### Build dEQP GL
-
-DEQP_API=GL \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=GLES \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-############### Build apitrace
-
-. .gitlab-ci/container/build-apitrace.sh
-
-############### Build validation layer for zink
-
-. .gitlab-ci/container/build-vulkan-validation.sh
-
-############### Build nine tests
-
-. .gitlab-ci/container/build-ninetests.sh
-
-############### Uninstall the build software
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -1,145 +0,0 @@
-#!/usr/bin/env bash
-# The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC1091
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y libelogind0  # this interfere with systemd deps, install separately
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    ccache
-    cmake
-    dpkg-dev
-    g++
-    glslang-tools
-    libexpat1-dev
-    gnupg2
-    libdrm-dev
-    libgbm-dev
-    libgles2-mesa-dev
-    liblz4-dev
-    libpciaccess-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxcb-ewmh-dev
-    libxcb-keysyms1-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    libzstd-dev
-    meson
-    p7zip
-    patch
-    pkgconf
-    python3-dev
-    python3-distutils
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    software-properties-common
-    wine64-tools
-    xz-utils
-)
-
-DEPS=(
-    curl
-    libepoxy0
-    libxcb-shm0
-    pciutils
-    python3-lxml
-    python3-simplejson
-    sysvinit-core
-    weston
-    xwayland
-    wine
-    wine64
-    xinit
-    xserver-xorg-video-amdgpu
-    xserver-xorg-video-ati
-)
-
-apt-get update
-
-apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-############### Install DXVK
-
-. .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
-. .gitlab-ci/container/install-wine-dxvk.sh
-
-############### Install apitrace binaries for wine
-
-. .gitlab-ci/container/install-wine-apitrace.sh
-# Add the apitrace path to the registry
-wine \
-    reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" \
-    /v Path \
-    /t REG_EXPAND_SZ \
-    /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;Z:\apitrace-msvc-win64\bin" \
-    /f
-
-############### Building ...
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Build parallel-deqp-runner's hang-detection tool
-
-. .gitlab-ci/container/build-hang-detection.sh
-
-############### Build piglit replayer
-# We don't run any _piglit_ Vulkan tests in the containers.
-PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-	     -DPIGLIT_USE_GBM=OFF
-	     -DPIGLIT_USE_WAYLAND=OFF
-	     -DPIGLIT_USE_X11=OFF
-	     -DPIGLIT_BUILD_GLX_TESTS=OFF
-	     -DPIGLIT_BUILD_EGL_TESTS=OFF
-	     -DPIGLIT_BUILD_WGL_TESTS=OFF
-	     -DPIGLIT_BUILD_GL_TESTS=OFF
-	     -DPIGLIT_BUILD_GLES1_TESTS=OFF
-	     -DPIGLIT_BUILD_GLES2_TESTS=OFF
-	     -DPIGLIT_BUILD_GLES3_TESTS=OFF
-	     -DPIGLIT_BUILD_CL_TESTS=OFF
-	     -DPIGLIT_BUILD_VK_TESTS=OFF
-	     -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF" \
-  PIGLIT_BUILD_TARGETS="piglit_replayer" \
-  . .gitlab-ci/container/build-piglit.sh
-
-############### Build Fossilize
-
-. .gitlab-ci/container/build-fossilize.sh
-
-############### Build dEQP VK
-
-DEQP_API=VK \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
-
-############### Build apitrace
-
-. .gitlab-ci/container/build-apitrace.sh
-
-############### Build gfxreconstruct
-
-. .gitlab-ci/container/build-gfxreconstruct.sh
-
-############### Build VKD3D-Proton
-
-. .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"
-
-. .gitlab-ci/container/build-vkd3d-proton.sh
-
-############### Uninstall the build software
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -25,13 +25,10 @@ DEPS=(
    bison
    ccache
    curl
-    "clang-${LLVM_VERSION}"
    "clang-format-${LLVM_VERSION}"
    dpkg-cross
-    dpkg-dev
    findutils
    flex
-    flatbuffers-compiler
    g++
    cmake
    gcc
@@ -44,7 +41,6 @@ DEPS=(
    libelf-dev
    libepoxy-dev
    libexpat1-dev
-    libflatbuffers-dev
    libgtk-3-dev
    "libllvm${LLVM_VERSION}"
    libomxil-bellagio-dev
@@ -60,7 +56,6 @@ DEPS=(
    libxrandr-dev
    libxrender-dev
    libxshmfence-dev
-    libxtensor-dev
    libxxf86vm-dev
    libwayland-egl-backend-dev
    make
@@ -71,10 +66,8 @@ DEPS=(
    python3-pil
    python3-pip
    python3-ply
-    python3-pycparser
    python3-requests
    python3-setuptools
-    python3-yaml
    qemu-user
    valgrind
    x11proto-dri2-dev
@@ -90,14 +83,11 @@ apt-get update
 apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
        $EXTRA_LOCAL_PACKAGES

-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
 # Needed for ci-fairy, this revision is able to upload files to S3
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2

-. .gitlab-ci/container/install-meson.sh
+# We need at least 1.3.1 for rusticl
+pip3 install --break-system-packages 'meson==1.3.1'

 . .gitlab-ci/container/build-rust.sh

--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -75,16 +75,25 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION

+. .gitlab-ci/container/build-llvm-spirv.sh
+
+. .gitlab-ci/container/build-libclc.sh
+
 . .gitlab-ci/container/build-wayland.sh

 . .gitlab-ci/container/build-shader-db.sh

 . .gitlab-ci/container/build-directx-headers.sh

-. .gitlab-ci/container/build-bindgen.sh
-
 python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.txt

+# install bindgen
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  bindgen-cli --version 0.62.0 \
+  --locked \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local
+
 ############### Uninstall the build software

 apt-get purge -y "${EPHEMERAL[@]}"
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -41,7 +41,6 @@ rm "$ndk.zip"
 ############### Build dEQP runner

 export ANDROID_NDK_HOME=/$ndk
-export RUST_TARGET=x86_64-linux-android
 . .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-deqp-runner.sh

@@ -50,12 +49,6 @@ rm -rf /root/.rustup

 ############### Build dEQP GL

-DEQP_API=GL \
-DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=GLES \
 DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh
@@ -80,14 +73,8 @@ popd

 ############### Building and installing Debian package ...

-ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd
-
-mkdir android-cuttlefish
+git clone --depth 1 https://github.com/google/android-cuttlefish.git
 pushd android-cuttlefish
-git init
-git remote add origin https://github.com/google/android-cuttlefish.git
-git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
-git checkout FETCH_HEAD

 pushd base
 dpkg-buildpackage -uc -us
--- a/.gitlab-ci/container/debian/x86_64_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-base.sh
@@ -1,4 +1,160 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting

-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-base.sh
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y ca-certificates gnupg2 software-properties-common
+
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
+
+echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
+
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    autoconf
+    automake
+    bc
+    bison
+    bzip2
+    ccache
+    cmake
+    "clang-${LLVM_VERSION}"
+    flex
+    glslang-tools
+    g++
+    libasound2-dev
+    libcap-dev
+    "libclang-cpp${LLVM_VERSION}-dev"
+    libdrm-dev
+    libegl-dev
+    libelf-dev
+    libepoxy-dev
+    libgbm-dev
+    libpciaccess-dev
+    libssl-dev
+    libvulkan-dev
+    libwayland-dev
+    libx11-xcb-dev
+    libxext-dev
+    "llvm-${LLVM_VERSION}-dev"
+    make
+    meson
+    openssh-server
+    patch
+    pkgconf
+    protobuf-compiler
+    python3-dev
+    python3-pip
+    python3-setuptools
+    python3-wheel
+    spirv-tools
+    wayland-protocols
+    xz-utils
+)
+
+DEPS=(
+    apt-utils
+    curl
+    git
+    git-lfs
+    inetutils-syslogd
+    iptables
+    jq
+    libasan8
+    libdrm2
+    libexpat1
+    "libllvm${LLVM_VERSION}"
+    liblz4-1
+    libpng16-16
+    libpython3.11
+    libvulkan1
+    libwayland-client0
+    libwayland-server0
+    libxcb-ewmh2
+    libxcb-randr0
+    libxcb-xfixes0
+    libxkbcommon0
+    libxrandr2
+    libxrender1
+    python3-mako
+    python3-numpy
+    python3-packaging
+    python3-pil
+    python3-requests
+    python3-six
+    python3-yaml
+    socat
+    vulkan-tools
+    waffle-utils
+    xauth
+    xvfb
+    zlib1g
+    zstd
+)
+
+apt-get update
+apt-get dist-upgrade -y
+
+apt-get install --purge -y \
+      sysvinit-core libelogind0
+
+apt-get install -y --no-remove "${DEPS[@]}"
+
+apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build kernel
+
+export DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+export KERNEL_IMAGE_NAME=bzImage
+export KERNEL_ARCH=x86_64
+export DEBIAN_ARCH=amd64
+
+mkdir -p /lava-files/
+. .gitlab-ci/container/build-kernel.sh
+
+# Needed for ci-fairy, this revision is able to upload files to MinIO
+# and doesn't depend on git
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+
+# Needed for manipulation with traces yaml files.
+pip3 install --break-system-packages yq
+
+. .gitlab-ci/container/build-mold.sh
+
+############### Build LLVM-SPIRV translator
+
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+############### Build libclc
+
+. .gitlab-ci/container/build-libclc.sh
+
+############### Build Wayland
+
+. .gitlab-ci/container/build-wayland.sh
+
+############### Build Crosvm
+
+. .gitlab-ci/container/build-rust.sh
+. .gitlab-ci/container/build-crosvm.sh
+
+############### Build dEQP runner
+. .gitlab-ci/container/build-deqp-runner.sh
+
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+rm -rf /root/.rustup
+
+. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh
@@ -1,3 +1,93 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting

-. .gitlab-ci/container/debian/test-gl.sh
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    bzip2
+    ccache
+    "clang-${LLVM_VERSION}"
+    cmake
+    g++
+    glslang-tools
+    libasound2-dev
+    libcap-dev
+    "libclang-cpp${LLVM_VERSION}-dev"
+    libdrm-dev
+    libgles2-mesa-dev
+    libpciaccess-dev
+    libpng-dev
+    libudev-dev
+    libvulkan-dev
+    libwaffle-dev
+    libwayland-dev
+    libx11-xcb-dev
+    libxcb-dri2-0-dev
+    libxkbcommon-dev
+    libxrandr-dev
+    libxrender-dev
+    "llvm-${LLVM_VERSION}-dev"
+    make
+    meson
+    ocl-icd-opencl-dev
+    patch
+    pkgconf
+    python3-distutils
+    xz-utils
+)
+
+DEPS=(
+    clinfo
+    iptables
+    "libclang-common-${LLVM_VERSION}-dev"
+    "libclang-cpp${LLVM_VERSION}"
+    libcap2
+    libegl1
+    libepoxy0
+    libfdt1
+    libxcb-shm0
+    ocl-icd-libopencl1
+    python3-lxml
+    python3-renderdoc
+    python3-simplejson
+    spirv-tools
+    sysvinit-core
+    weston
+)
+
+apt-get update
+
+apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
+      $EXTRA_LOCAL_PACKAGES
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build piglit
+
+PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
+
+############### Build dEQP GL
+
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
+
+############### Build apitrace
+
+. .gitlab-ci/container/build-apitrace.sh
+
+############### Build validation layer for zink
+
+. .gitlab-ci/container/build-vulkan-validation.sh
+
+############### Uninstall the build software
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-vk.sh
@@ -1,3 +1,126 @@
 #!/usr/bin/env bash
+# The relative paths in this file only become valid at runtime.
+# shellcheck disable=SC1091
+# shellcheck disable=SC2086 # we want word splitting

-. .gitlab-ci/container/debian/test-vk.sh
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    ccache
+    cmake
+    g++
+    glslang-tools
+    libexpat1-dev
+    gnupg2
+    libdrm-dev
+    libgbm-dev
+    libgles2-mesa-dev
+    liblz4-dev
+    libpciaccess-dev
+    libudev-dev
+    libvulkan-dev
+    libwaffle-dev
+    libx11-xcb-dev
+    libxcb-ewmh-dev
+    libxcb-keysyms1-dev
+    libxkbcommon-dev
+    libxrandr-dev
+    libxrender-dev
+    libzstd-dev
+    meson
+    p7zip
+    patch
+    pkgconf
+    python3-dev
+    python3-distutils
+    python3-pip
+    python3-setuptools
+    python3-wheel
+    software-properties-common
+    wine64-tools
+    xz-utils
+)
+
+DEPS=(
+    curl
+    libepoxy0
+    libxcb-shm0
+    pciutils
+    python3-lxml
+    python3-simplejson
+    sysvinit-core
+    weston
+    xwayland
+    wine
+    wine64
+    xinit
+    xserver-xorg-video-amdgpu
+    xserver-xorg-video-ati
+)
+
+apt-get update
+
+apt-get install -y --no-remove --no-install-recommends \
+      "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+############### Install DXVK
+
+. .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
+. .gitlab-ci/container/install-wine-dxvk.sh
+
+############### Install apitrace binaries for wine
+
+. .gitlab-ci/container/install-wine-apitrace.sh
+# Add the apitrace path to the registry
+wine \
+    reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" \
+    /v Path \
+    /t REG_EXPAND_SZ \
+    /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;Z:\apitrace-msvc-win64\bin" \
+    /f
+
+############### Building ...
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build parallel-deqp-runner's hang-detection tool
+
+. .gitlab-ci/container/build-hang-detection.sh
+
+############### Build piglit replayer
+
+PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
+
+############### Build Fossilize
+
+. .gitlab-ci/container/build-fossilize.sh
+
+############### Build dEQP VK
+
+. .gitlab-ci/container/build-deqp.sh
+
+############### Build apitrace
+
+. .gitlab-ci/container/build-apitrace.sh
+
+############### Build gfxreconstruct
+
+. .gitlab-ci/container/build-gfxreconstruct.sh
+
+############### Build VKD3D-Proton
+
+. .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"
+
+. .gitlab-ci/container/build-vkd3d-proton.sh
+
+############### Uninstall the build software
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -27,11 +27,9 @@ EPHEMERAL=(
 DEPS=(
    bindgen
    bison
-    cbindgen
    ccache
    clang-devel
    flex
-    flatbuffers-compiler
    gcc
    gcc-c++
    gettext
@@ -43,7 +41,6 @@ DEPS=(
    "pkgconfig(SPIRV-Tools)"
    "pkgconfig(dri2proto)"
    "pkgconfig(expat)"
-    "pkgconfig(flatbuffers)"
    "pkgconfig(glproto)"
    "pkgconfig(libclc)"
    "pkgconfig(libelf)"
@@ -69,7 +66,6 @@ DEPS=(
    "pkgconfig(xfixes)"
    "pkgconfig(xrandr)"
    "pkgconfig(xshmfence)"
-    "pkgconfig(xtensor)"
    "pkgconfig(xxf86vm)"
    "pkgconfig(zlib)"
    procps-ng
@@ -77,8 +73,6 @@ DEPS=(
    python3-devel
    python3-mako
    python3-ply
-    python3-pycparser
-    python3-yaml
    rust-packaging
    vulkan-headers
    spirv-tools-devel
@@ -102,7 +96,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION

-. .gitlab-ci/container/install-meson.sh
+# We need at least 1.3.1 for rusticl
+pip install meson==1.3.1

 . .gitlab-ci/container/build-mold.sh

--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -40,16 +40,10 @@
 # repository's container registry, so that the image from the main
 # repository's registry will be used there as well.

-.debian-container-version:
+.debian-container:
  variables:
    FDO_DISTRIBUTION_VERSION: bookworm-slim

-.debian-container:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    - .debian-container-version
-
 .container:
  stage: container
  extends:
@@ -69,6 +63,8 @@
 # Debian based x86_64 build image base
 debian/x86_64_build-base:
  extends:
+    - .fdo.container-build@debian
+    - .container
    - .debian-container
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
@@ -80,7 +76,7 @@ debian/x86_64_build-base:
 .use-debian/x86_64_build-base:
  extends:
    - .fdo.container-build@debian
-    - .debian-container-version
+    - .debian-container
    - .use-base-image
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
@@ -182,15 +178,14 @@ debian/android_build:

 # Debian based x86_64 test image base
 debian/x86_64_test-base:
-  extends:
-    - .debian-container
+  extends: debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_TAG}"

 .use-debian/x86_64_test-base:
  extends:
    - .fdo.container-build@debian
-    - .debian-container-version
+    - .debian-container
    - .use-base-image
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
@@ -198,33 +193,11 @@ debian/x86_64_test-base:
  needs:
    - debian/x86_64_test-base

-# Debian based aarch64 test image base
-debian/arm64_test-base:
-  tags:
-    - aarch64
-  extends:
-    - .debian-container
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-
-.use-debian/arm64_test-base:
-  tags:
-    - aarch64
-  extends:
-    - .fdo.container-build@debian
-    - .debian-container-version
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: ${DEBIAN_ARM64_TEST_BASE_IMAGE}
-    MESA_BASE_TAG: *debian-arm64_test-base
-  needs:
-    - debian/arm64_test-base
-
 # Debian based x86_64 test image for GL
 debian/x86_64_test-gl:
  extends: .use-debian/x86_64_test-base
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_X86_64_TEST_GL_TAG}

 .use-debian/x86_64_test-gl:
  extends:
@@ -240,7 +213,7 @@ debian/x86_64_test-gl:
 debian/x86_64_test-vk:
  extends: .use-debian/x86_64_test-base
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_X86_64_TEST_VK_TAG}

 .use-debian/x86_64_test-vk:
  extends:
@@ -253,10 +226,10 @@ debian/x86_64_test-vk:
    - debian/x86_64_test-vk

 # Debian based x86_64 test image for Android
-.debian/x86_64_test-android:
+debian/x86_64_test-android:
  extends: .use-debian/x86_64_test-base
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
    ANDROID_NDK: android-ndk-r25b

 .use-debian/x86_64_test-android:
@@ -269,52 +242,12 @@ debian/x86_64_test-vk:
  needs:
    - debian/x86_64_test-android

-# Debian based aarch64 test image for GL
-debian/arm64_test-gl:
-  tags:
-    - aarch64
-  extends: .use-debian/arm64_test-base
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG}
-
-.use-debian/arm64_test-gl:
-  tags:
-    - aarch64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_ARM64_TEST_IMAGE_GL_PATH}
-    MESA_IMAGE_TAG: *debian-arm64_test-gl
-  needs:
-    - debian/arm64_test-gl
-
-# Debian based aarch64 test image for VK
-debian/arm64_test-vk:
-  tags:
-    - aarch64
-  extends: .use-debian/arm64_test-base
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-vk ${DEBIAN_TEST_VK_TAG}
-
-.use-debian/arm64_test-vk:
-  tags:
-    - aarch64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_ARM64_TEST_IMAGE_VK_PATH}
-    MESA_IMAGE_TAG: *debian-arm64_test-vk
-  needs:
-    - debian/arm64_test-vk
-
 # Debian based ARM build image
 debian/arm64_build:
  extends:
    - .fdo.container-build@debian
    - .container
-    - .debian-container-version
+    - .debian-container
  tags:
    - aarch64
  variables:
@@ -346,14 +279,6 @@ alpine/x86_64_build:
    - .alpine/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
-  rules:
-    # Note: the next three lines must remain in that order, so that the rules
-    # in `linkcheck-docs` catch nightly pipelines before the rules in `pages`
-    # exclude them.
-    - !reference [linkcheck-docs, rules]
-    - !reference [pages, rules]
-    - !reference [test-docs, rules]
-    - !reference [.container, rules]

 .use-alpine/x86_64_build:
  extends:
@@ -393,9 +318,8 @@ fedora/x86_64_build:
 .kernel+rootfs:
  extends:
    - .container+build-rules
-    - .debian-container-version
+    - .debian-container
  stage: container
-  timeout: 90m
  variables:
    GIT_STRATEGY: fetch
    MESA_ROOTFS_TAG: &kernel-rootfs ${KERNEL_ROOTFS_TAG}
@@ -439,59 +363,59 @@ kernel+rootfs_arm32:
    MESA_ROOTFS_TAG: *kernel-rootfs

 # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
-.debian/baremetal_arm_test:
+.debian/arm_test:
  extends:
    - .fdo.container-build@debian
    - .container
-    - .debian-container-version
+    - .debian-container
    # Don't want the .container rules
    - .container+build-rules
  variables:
    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-    ARTIFACTS_PREFIX: "https://${S3_HOST}/${S3_KERNEL_BUCKET}"
+    ARTIFACTS_PREFIX: "https://${S3_HOST}/mesa-lava"
    ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
    MESA_ARTIFACTS_TAG: *debian-arm64_build
    MESA_ROOTFS_TAG: *kernel-rootfs

-debian/baremetal_arm32_test:
+debian/arm32_test:
  extends:
-    - .debian/baremetal_arm_test
+    - .debian/arm_test
  needs:
    - kernel+rootfs_arm32
  variables:
    MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"

-debian/baremetal_arm64_test:
+debian/arm64_test:
  extends:
-    - .debian/baremetal_arm_test
+    - .debian/arm_test
  needs:
    - kernel+rootfs_arm64
  variables:
    MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"

-.use-debian/baremetal_arm_test:
+.use-debian/arm_test:
  variables:
    MESA_ROOTFS_TAG: *kernel-rootfs

-.use-debian/baremetal_arm32_test:
+.use-debian/arm32_test:
  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
  extends:
-    - .use-debian/baremetal_arm_test
+    - .use-debian/arm_test
  variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm32_test"
+    MESA_IMAGE_PATH: "debian/arm32_test"
    MESA_IMAGE_TAG: *debian-arm32_test
  needs:
-    - debian/baremetal_arm_test
+    - debian/arm_test

-.use-debian/baremetal_arm64_test:
+.use-debian/arm64_test:
  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
  extends:
-    - .use-debian/baremetal_arm_test
+    - .use-debian/arm_test
  variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm64_test"
+    MESA_IMAGE_PATH: "debian/arm64_test"
    MESA_IMAGE_TAG: *debian-arm64_test
  needs:
-    - debian/baremetal_arm_test
+    - debian/arm_test

 # Native Windows docker builds
 #
--- a/.gitlab-ci/container/install-meson.sh
+++ b/.gitlab-ci/container/install-meson.sh
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-# FEDORA_X86_64_BUILD_TAG
-
-rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
-
-# We need at least 1.4.0 for rusticl
-pip3 install 'meson==1.4.0'
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -14,7 +14,7 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"

 check_minio()
 {
-    S3_PATH="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
+    S3_PATH="${S3_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
    if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
      "https://${S3_PATH}/done"; then
        echo "Remote files are up-to-date, skip rebuilding them."
@@ -31,8 +31,6 @@ check_minio "${CI_PROJECT_PATH}"
 . .gitlab-ci/container/build-rust.sh

 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
-    BUILD_CL="ON"
-    BUILD_VK="ON"
    GCC_ARCH="aarch64-linux-gnu"
    KERNEL_ARCH="arm64"
    SKQP_ARCH="arm64"
@@ -54,8 +52,6 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
    KERNEL_IMAGE_NAME="Image"

 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
-    BUILD_CL="OFF"
-    BUILD_VK="OFF"
    GCC_ARCH="arm-linux-gnueabihf"
    KERNEL_ARCH="arm"
    SKQP_ARCH="arm"
@@ -80,8 +76,6 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
      libxkbcommon-dev:armhf
    )
 else
-    BUILD_CL="ON"
-    BUILD_VK="ON"
    GCC_ARCH="x86_64-linux-gnu"
    KERNEL_ARCH="x86_64"
    SKQP_ARCH="x64"
@@ -89,7 +83,7 @@ else
    DEVICE_TREES=""
    KERNEL_IMAGE_NAME="bzImage"
    CONTAINER_ARCH_PACKAGES=(
-      libasound2-dev libcap-dev libfdt-dev libva-dev p7zip wine
+      libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols p7zip wine
    )
 fi

@@ -150,15 +144,9 @@ CONTAINER_EPHEMERAL=(
    python3-serial
    python3-venv
    unzip
-    wayland-protocols
    zstd
 )

-[ "$BUILD_CL" == "ON" ] && CONTAINER_EPHEMERAL+=(
-	ocl-icd-opencl-dev
-)
-
-
 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list

 apt-get update
@@ -202,6 +190,7 @@ PKG_DEP=(
 # arch dependent rootfs packages
 [ "$DEBIAN_ARCH" = "arm64" ] && PKG_ARCH=(
  libgl1 libglu1-mesa
+  libvulkan-dev
  firmware-linux-nonfree firmware-qcom-media
  libfontconfig1
 )
@@ -214,6 +203,7 @@ PKG_DEP=(
  spirv-tools
  libelf1 libfdt1 "libllvm${LLVM_VERSION}"
  libva2 libva-drm2
+  libvulkan-dev
  socat
  sysvinit-core
  wine
@@ -222,16 +212,6 @@ PKG_DEP=(
  firmware-misc-nonfree
 )

-[ "$BUILD_CL" == "ON" ] && PKG_ARCH+=(
-	clinfo
-	"libclang-cpp${LLVM_VERSION}"
-	"libclang-common-${LLVM_VERSION}-dev"
-	ocl-icd-libopencl1
-)
-[ "$BUILD_VK" == "ON" ] && PKG_ARCH+=(
-	libvulkan-dev
-)
-
 mmdebstrap \
    --variant=apt \
    --arch="${DEBIAN_ARCH}" \
@@ -264,17 +244,6 @@ fi
 STRIP_CMD="${GCC_ARCH}-strip"
 mkdir -p $ROOTFS/usr/lib/$GCC_ARCH

-############### Build libclc
-
-if [ "$BUILD_CL" = "ON" ]; then
-  rm -rf /usr/lib/clc/*
-  . .gitlab-ci/container/build-libclc.sh
-  mkdir -p $ROOTFS/usr/{share,lib}/clc
-  mv /usr/share/clc/spirv*-mesa3d-.spv $ROOTFS/usr/share/clc/
-  ln -s /usr/share/clc/spirv64-mesa3d-.spv $ROOTFS/usr/lib/clc/
-  ln -s /usr/share/clc/spirv-mesa3d-.spv $ROOTFS/usr/lib/clc/
-fi
-
 ############### Build Vulkan validation layer (for zink)
 if [ "$DEBIAN_ARCH" = "amd64" ]; then
  . .gitlab-ci/container/build-vulkan-validation.sh
@@ -303,17 +272,7 @@ mv /usr/local/bin/*-runner $ROOTFS/usr/bin/.


 ############### Build dEQP
-DEQP_API=GL \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=GLES \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-[ "$BUILD_VK" == "ON" ] && DEQP_API=VK \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh

 mv /deqp $ROOTFS/.

@@ -326,21 +285,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]] \
 fi

 ############### Build piglit
-PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-	     -DPIGLIT_USE_GBM=ON
-	     -DPIGLIT_USE_WAYLAND=ON
-	     -DPIGLIT_USE_X11=ON
-	     -DPIGLIT_BUILD_GLX_TESTS=ON
-	     -DPIGLIT_BUILD_EGL_TESTS=ON
-	     -DPIGLIT_BUILD_WGL_TESTS=OFF
-	     -DPIGLIT_BUILD_GL_TESTS=ON
-	     -DPIGLIT_BUILD_GLES1_TESTS=ON
-	     -DPIGLIT_BUILD_GLES2_TESTS=ON
-	     -DPIGLIT_BUILD_GLES3_TESTS=ON
-	     -DPIGLIT_BUILD_CL_TESTS=$BUILD_CL
-	     -DPIGLIT_BUILD_VK_TESTS=$BUILD_VK
-	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
-  . .gitlab-ci/container/build-piglit.sh
+PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON -DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
 mv /piglit $ROOTFS/.

 ############### Build libva tests
@@ -372,8 +317,8 @@ if [[ -e ".gitlab-ci/local/build-rootfs.sh" ]]; then
 fi


-############### Download prebuilt kernel
-. .gitlab-ci/container/download-prebuilt-kernel.sh
+############### Build kernel
+. .gitlab-ci/container/build-kernel.sh

 ############### Delete rust, since the tests won't be compiling anything.
 rm -rf /root/.cargo
@@ -410,8 +355,8 @@ popd

 . .gitlab-ci/container/container_post_build.sh

-ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
      https://${S3_PATH}/"${ROOTFSTAR}"

 touch /lava-files/done
-ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/done https://${S3_PATH}/done
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${S3_PATH}/done
--- a/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
@@ -1,182 +0,0 @@
-From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-Date: Fri, 26 Aug 2022 18:24:27 +0200
-Subject: [PATCH 1/2] Allow running on Android from the command line
-
-For testing the Android EGL platform without having to go via the
-Android activity manager, build deqp-egl.
-
-Tests that render to native windows are unsupported, as command line
-programs cannot create windows on Android.
-
-$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
-$ ninja -C build modules/egl/deqp-egl
-
-Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
- CMakeLists.txt                                | 38 ++-----------------
- .../android/tcuAndroidNativeActivity.cpp      | 36 +++++++++---------
- .../platform/android/tcuAndroidPlatform.cpp   | 12 +++++-
- 3 files changed, 34 insertions(+), 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb58cc7ba..98b8fc6cc 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,7 +272,7 @@ include_directories(
- 	external/vulkancts/framework/vulkan
- 	)
- 
-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# On Android deqp modules are compiled as libraries and linked into final .so
- 	set(DEQP_MODULE_LIBRARIES )
- 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
- 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
- 
-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
- 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
- 
-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
- add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
- 
- # Single-binary targets
-if (DE_OS_IS_ANDROID)
-	include_directories(executor)
-	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
-
-	set(DEQP_SRCS
-		framework/platform/android/tcuAndroidMain.cpp
-		framework/platform/android/tcuAndroidJNI.cpp
-		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
-		framework/platform/android/tcuTestLogParserJNI.cpp
-		${DEQP_MODULE_ENTRY_POINTS}
-		)
-
-	set(DEQP_LIBS
-		tcutil-platform
-		xecore
-		${DEQP_MODULE_LIBRARIES}
-		)
-
-	add_library(deqp SHARED ${DEQP_SRCS})
-	target_link_libraries(deqp ${DEQP_LIBS})
-
-	# Separate out the debug information because it's enormous
-	add_custom_command(TARGET deqp POST_BUILD
-		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
-		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
-
-	# Needed by OpenGL CTS that defines its own activity but depends on
-	# common Android support code.
-	target_include_directories(deqp PRIVATE framework/platform/android)
-
-elseif (DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# Code sign identity
- 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
- 
-diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 6f8cd8fc5..b83e30f41 100644
--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
-+++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
-@@ -116,23 +116,25 @@ namespace Android
- NativeActivity::NativeActivity (ANativeActivity* activity)
- 	: m_activity(activity)
- {
-	activity->instance								= (void*)this;
-	activity->callbacks->onStart					= onStartCallback;
-	activity->callbacks->onResume					= onResumeCallback;
-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
-	activity->callbacks->onPause					= onPauseCallback;
-	activity->callbacks->onStop						= onStopCallback;
-	activity->callbacks->onDestroy					= onDestroyCallback;
-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
-+	if (activity) {
-+		activity->instance								= (void*)this;
-+		activity->callbacks->onStart					= onStartCallback;
-+		activity->callbacks->onResume					= onResumeCallback;
-+		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
-+		activity->callbacks->onPause					= onPauseCallback;
-+		activity->callbacks->onStop						= onStopCallback;
-+		activity->callbacks->onDestroy					= onDestroyCallback;
-+		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
-+		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
-+		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
-+		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
-+		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
-+		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
-+		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
-+		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
-+		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
-+		activity->callbacks->onLowMemory				= onLowMemoryCallback;
-+	}
- }
- 
- NativeActivity::~NativeActivity (void)
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index b8a35898c..cf02e6b70 100644
--- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -22,6 +22,7 @@
-  *//*--------------------------------------------------------------------*/
- 
- #include "tcuAndroidPlatform.hpp"
-+#include "tcuAndroidNativeActivity.hpp"
- #include "tcuAndroidUtil.hpp"
- #include "gluRenderContext.hpp"
- #include "egluNativeDisplay.hpp"
-@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
- 	Window* window = m_windowRegistry.tryAcquireWindow();
- 
- 	if (!window)
-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
-+		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
- 
- 	return new NativeWindow(window, params.width, params.height, format);
- }
-@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
- 
- 	try
- 	{
-+		if (!activity)
-+			throw tcu::InternalError("No activity (running from command line?");
-+
- 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
- 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
- 		return totalMemory;
-@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
- 
- } // Android
- } // tcu
-+
-+tcu::Platform* createPlatform (void)
-+{
-+	tcu::Android::NativeActivity activity(NULL);
-+	return new tcu::Android::Platform(activity);
-+}
-- 
-2.42.0
-
--- a/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
@@ -1,182 +0,0 @@
-From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-Date: Fri, 26 Aug 2022 18:24:27 +0200
-Subject: [PATCH 1/2] Allow running on Android from the command line
-
-For testing the Android EGL platform without having to go via the
-Android activity manager, build deqp-egl.
-
-Tests that render to native windows are unsupported, as command line
-programs cannot create windows on Android.
-
-$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
-$ ninja -C build modules/egl/deqp-egl
-
-Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
- CMakeLists.txt                                | 38 ++-----------------
- .../android/tcuAndroidNativeActivity.cpp      | 36 +++++++++---------
- .../platform/android/tcuAndroidPlatform.cpp   | 12 +++++-
- 3 files changed, 34 insertions(+), 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb58cc7ba..98b8fc6cc 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,7 +272,7 @@ include_directories(
- 	external/vulkancts/framework/vulkan
- 	)
- 
-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# On Android deqp modules are compiled as libraries and linked into final .so
- 	set(DEQP_MODULE_LIBRARIES )
- 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
- 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
- 
-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
- 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
- 
-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
- add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
- 
- # Single-binary targets
-if (DE_OS_IS_ANDROID)
-	include_directories(executor)
-	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
-
-	set(DEQP_SRCS
-		framework/platform/android/tcuAndroidMain.cpp
-		framework/platform/android/tcuAndroidJNI.cpp
-		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
-		framework/platform/android/tcuTestLogParserJNI.cpp
-		${DEQP_MODULE_ENTRY_POINTS}
-		)
-
-	set(DEQP_LIBS
-		tcutil-platform
-		xecore
-		${DEQP_MODULE_LIBRARIES}
-		)
-
-	add_library(deqp SHARED ${DEQP_SRCS})
-	target_link_libraries(deqp ${DEQP_LIBS})
-
-	# Separate out the debug information because it's enormous
-	add_custom_command(TARGET deqp POST_BUILD
-		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
-		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
-
-	# Needed by OpenGL CTS that defines its own activity but depends on
-	# common Android support code.
-	target_include_directories(deqp PRIVATE framework/platform/android)
-
-elseif (DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# Code sign identity
- 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
- 
-diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 6f8cd8fc5..b83e30f41 100644
--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
-+++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
-@@ -116,23 +116,25 @@ namespace Android
- NativeActivity::NativeActivity (ANativeActivity* activity)
- 	: m_activity(activity)
- {
-	activity->instance								= (void*)this;
-	activity->callbacks->onStart					= onStartCallback;
-	activity->callbacks->onResume					= onResumeCallback;
-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
-	activity->callbacks->onPause					= onPauseCallback;
-	activity->callbacks->onStop						= onStopCallback;
-	activity->callbacks->onDestroy					= onDestroyCallback;
-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
-+	if (activity) {
-+		activity->instance								= (void*)this;
-+		activity->callbacks->onStart					= onStartCallback;
-+		activity->callbacks->onResume					= onResumeCallback;
-+		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
-+		activity->callbacks->onPause					= onPauseCallback;
-+		activity->callbacks->onStop						= onStopCallback;
-+		activity->callbacks->onDestroy					= onDestroyCallback;
-+		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
-+		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
-+		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
-+		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
-+		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
-+		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
-+		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
-+		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
-+		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
-+		activity->callbacks->onLowMemory				= onLowMemoryCallback;
-+	}
- }
- 
- NativeActivity::~NativeActivity (void)
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index b8a35898c..cf02e6b70 100644
--- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -22,6 +22,7 @@
-  *//*--------------------------------------------------------------------*/
- 
- #include "tcuAndroidPlatform.hpp"
-+#include "tcuAndroidNativeActivity.hpp"
- #include "tcuAndroidUtil.hpp"
- #include "gluRenderContext.hpp"
- #include "egluNativeDisplay.hpp"
-@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
- 	Window* window = m_windowRegistry.tryAcquireWindow();
- 
- 	if (!window)
-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
-+		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
- 
- 	return new NativeWindow(window, params.width, params.height, format);
- }
-@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
- 
- 	try
- 	{
-+		if (!activity)
-+			throw tcu::InternalError("No activity (running from command line?");
-+
- 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
- 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
- 		return totalMemory;
-@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
- 
- } // Android
- } // tcu
-+
-+tcu::Platform* createPlatform (void)
-+{
-+	tcu::Android::NativeActivity activity(NULL);
-+	return new tcu::Android::Platform(activity);
-+}
-- 
-2.42.0
-
--- a/.gitlab-ci/container/patches/build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch
@@ -1,26 +0,0 @@
-From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
-From: Helen Koike <helen.koike@collabora.com>
-Date: Tue, 27 Sep 2022 12:35:22 -0300
-Subject: [PATCH 2/2] Android prints to stdout instead of logcat
-
-Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
- framework/qphelper/qpDebugOut.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
-index 6579e9f48..c200c6f6b 100644
--- a/framework/qphelper/qpDebugOut.c
-+++ b/framework/qphelper/qpDebugOut.c
-@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
- }
- 
- /* print() implementation. */
-#if (DE_OS == DE_OS_ANDROID)
-+#if (0)
- 
- #include <android/log.h>
- 
-- 
-2.42.0
-
--- a/.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
+++ b/.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
@@ -1,26 +0,0 @@
-From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
-From: Helen Koike <helen.koike@collabora.com>
-Date: Tue, 27 Sep 2022 12:35:22 -0300
-Subject: [PATCH 2/2] Android prints to stdout instead of logcat
-
-Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
- framework/qphelper/qpDebugOut.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
-index 6579e9f48..c200c6f6b 100644
--- a/framework/qphelper/qpDebugOut.c
-+++ b/framework/qphelper/qpDebugOut.c
-@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
- }
- 
- /* print() implementation. */
-#if (DE_OS == DE_OS_ANDROID)
-+#if (0)
- 
- #include <android/log.h>
- 
-- 
-2.42.0
-
--- a/.gitlab-ci/container/patches/build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
--- a/.gitlab-ci/container/patches/build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -96,9 +96,9 @@ set +e -x
 NIR_DEBUG="novalidate" \
 LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \
 GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \
-VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
+VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
 crosvm --no-syslog run \
-    --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=${VIRGL_RENDER_SERVER:-/usr/local/libexec/virgl_render_server}" \
+    --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
    -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \
    --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
    --net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -48,7 +48,7 @@ $ADB shell setenforce 0
 # deqp

 $ADB push /deqp/modules/egl/deqp-egl-android /data/.
-$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt /data/
+$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt /data/.
 $ADB push /deqp-runner/deqp-runner /data/.

 # download Android Mesa from S3
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -18,8 +18,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json
+export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/

 if [ -n "$USE_ANGLE" ]; then
@@ -47,6 +46,7 @@ if [ -z "$DEQP_SUITE" ]; then
    DEQP_WIDTH=${DEQP_WIDTH:-256}
    DEQP_HEIGHT=${DEQP_HEIGHT:-256}
    DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0}
+    DEQP_VARIANT=${DEQP_VARIANT:-master}

    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT"
    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
@@ -60,16 +60,16 @@ if [ -z "$DEQP_SUITE" ]; then

    # Generate test case list file.
    if [ "$DEQP_VER" = "vk" ]; then
-       MUSTPASS=/deqp/mustpass/vk-main.txt
+       MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
       DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
    elif [ "$DEQP_VER" = "gles2" ] || [ "$DEQP_VER" = "gles3" ] || [ "$DEQP_VER" = "gles31" ] || [ "$DEQP_VER" = "egl" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
       DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
    elif [ "$DEQP_VER" = "gles2-khr" ] || [ "$DEQP_VER" = "gles3-khr" ] || [ "$DEQP_VER" = "gles31-khr" ] || [ "$DEQP_VER" = "gles32-khr" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
       DEQP=/deqp/external/openglcts/modules/glcts
    else
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
       DEQP=/deqp/external/openglcts/modules/glcts
    fi

@@ -169,13 +169,7 @@ fi

 uncollapsed_section_switch deqp "deqp: deqp-runner"

-# Print the detailed version with the list of backports and local patches
-for api in vk gl gles; do
-  deqp_version_log=/deqp/version-$api
-  if [ -r "$deqp_version_log" ]; then
-    cat "$deqp_version_log"
-  fi
-done
+cat /deqp/version-log

 set +e
 if [ -z "$DEQP_SUITE" ]; then
--- a/.gitlab-ci/download-git-cache.sh
+++ b/.gitlab-ci/download-git-cache.sh
@@ -18,7 +18,7 @@ TMP_DIR=$(mktemp -d)
 echo "$(date +"%F %T") Downloading archived master..."
 if ! /usr/bin/wget \
 	      -O "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
-              "https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
+              "https://${S3_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
 then
    echo "Repository cache not available"
    exit
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -237,25 +237,6 @@
      when: never
    - !reference [.freedreno-farm-rules, rules]

-.vmware-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/vmware ]
-      when: never
-    - changes: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.vmware-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/vmware ]
-      when: never
-    - changes: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.vmware-farm-rules, rules]

 .ondracka-farm-rules:
  rules:
@@ -330,10 +311,6 @@
      changes: [ .ci-farms-disabled/ondracka ]
      exists: [ .ci-farms-disabled/ondracka ]
      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/vmware ]
-      exists: [ .ci-farms-disabled/vmware ]
-      when: never
    # Any other change to ci-farms/* means some farm is getting re-enabled.
    # Run jobs in Marge pipelines (and let it fallback to manual otherwise)
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"'
--- a/.gitlab-ci/fossilize-runner.sh
+++ b/.gitlab-ci/fossilize-runner.sh
@@ -11,7 +11,7 @@ INSTALL=$PWD/install

 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"

 # To store Fossilize logs on failure.
 RESULTS="$PWD/results"
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,49 +1,40 @@
-# Keep the tags below under 20 chars each, as they end up combined into
+# Keep the tags below under 25-30 chars each, as they end up combined into
 # docker image tags, and docker has a length limit of 128 chars total in tags.
 #
-# The word after the date doesn't need to be overly descriptive, it exists
-# purely to avoid the risk of two people updating an image tag on the same day
-# while working on different changes, so it doesn't matter whether that word
-# will make sense to someone else. Aim for "nobody else will pick that word
-# for their change".
-#
 # If you update a tag and you get an error like this:
 #     cannot parse input: "$image:$tag": invalid reference format
 # check the length of $tag; if it's > 128 chars you need to shorten your tag.

 variables:
   DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20240717-pyyaml-3"
+   DEBIAN_BASE_TAG: "2024-01-10-deb-fix"

   DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240717-pyyaml-3"
+   DEBIAN_BUILD_TAG: "2024-01-04-find"

   DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
-   DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"

   DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
-   DEBIAN_ARM64_TEST_IMAGE_GL_PATH: "debian/arm64_test-gl"
   DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
-   DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
   DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"

-   DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
-   DEBIAN_TEST_GL_TAG: "20240713-piglit-58"
-   DEBIAN_TEST_VK_TAG: "20240713-piglit-58"
-   KERNEL_ROOTFS_TAG: "20240713-piglit-58"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-default"
+   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-default"
+   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-default"

-   ALPINE_X86_64_BUILD_TAG: "20240717-pyyaml"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
-   FEDORA_X86_64_BUILD_TAG: "20240717-pyyaml"
-   KERNEL_TAG: "v6.6.21-mesa-f8ea"
+   ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
+   ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
+   FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
+   KERNEL_ROOTFS_TAG: "2024-01-10-default"
+   KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
   KERNEL_REPO: "gfx-ci/linux"
-   PKG_REPO_REV: "bca9635d"
+   PKG_REPO_REV: "67f2c46b"

   WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
-   WINDOWS_X64_MSVC_TAG: "20240717-pyyaml-3"
+   WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc"

   WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "20240717-pyyaml-3"
+   WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc"

   WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "20240717-pyyaml-3"
+   WINDOWS_X64_TEST_TAG: "2023-12-22-msvc"
--- a/.gitlab-ci/lava/exceptions.py
+++ b/.gitlab-ci/lava/exceptions.py
@@ -5,36 +5,24 @@ class MesaCIException(Exception):
    pass


-class MesaCIRetriableException(MesaCIException):
-    pass
-
-
-class MesaCITimeoutError(MesaCIRetriableException):
+class MesaCITimeoutError(MesaCIException):
    def __init__(self, *args, timeout_duration: timedelta) -> None:
        super().__init__(*args)
        self.timeout_duration = timeout_duration


-class MesaCIRetryError(MesaCIRetriableException):
+class MesaCIRetryError(MesaCIException):
    def __init__(self, *args, retry_count: int, last_job: None) -> None:
        super().__init__(*args)
        self.retry_count = retry_count
        self.last_job = last_job


-class MesaCIFatalException(MesaCIException):
-    """Exception raised when the Mesa CI script encounters a fatal error that
-    prevents the script from continuing."""
-
-    def __init__(self, *args) -> None:
-        super().__init__(*args)
-
-
-class MesaCIParseException(MesaCIRetriableException):
+class MesaCIParseException(MesaCIException):
    pass


-class MesaCIKnownIssueException(MesaCIRetriableException):
+class MesaCIKnownIssueException(MesaCIException):
    """Exception raised when the Mesa CI script finds something in the logs that
    is known to cause the LAVA job to eventually fail"""

--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
    # proxy used to cache data locally
    FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
    # base system generated by the container build job, shared between many pipelines
-    BASE_SYSTEM_HOST_PREFIX: "${S3_HOST}/${S3_KERNEL_BUCKET}"
+    BASE_SYSTEM_HOST_PREFIX: "${S3_HOST}/mesa-lava"
    BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
    BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
    # per-job build artifacts
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -30,7 +30,7 @@ artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env
 section_end variables

 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
-ci-fairy s3cp --token-file "${S3_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"

 ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME:?}.tar.zst"

@@ -49,9 +49,8 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--first-stage-init artifacts/ci-common/init-stage1.sh \
 	--ci-project-dir "${CI_PROJECT_DIR}" \
 	--device-type "${DEVICE_TYPE}" \
-	--farm "${FARM}" \
 	--dtb-filename "${DTB}" \
-	--jwt-file "${S3_JWT_FILE}" \
+	--jwt-file "${CI_JOB_JWT_FILE}" \
 	--kernel-image-name "${KERNEL_IMAGE_NAME}" \
 	--kernel-image-type "${KERNEL_IMAGE_TYPE}" \
 	--boot-method "${BOOT_METHOD}" \
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -16,7 +16,7 @@ import sys
 import time
 from collections import defaultdict
 from dataclasses import dataclass, fields
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from os import environ, getenv, path
 from typing import Any, Optional

@@ -25,8 +25,6 @@ from lavacli.utils import flow_yaml as lava_yaml

 from lava.exceptions import (
    MesaCIException,
-    MesaCIFatalException,
-    MesaCIRetriableException,
    MesaCIParseException,
    MesaCIRetryError,
    MesaCITimeoutError,
@@ -60,7 +58,7 @@ except ImportError as e:

 # Timeout in seconds to decide if the device from the dispatched LAVA job has
 # hung or not due to the lack of new log output.
-DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC", 5 * 60))
+DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC",  5*60))

 # How many seconds the script should wait before try a new polling iteration to
 # check if the dispatched LAVA job is running or waiting in the job queue.
@@ -83,29 +81,18 @@ NUMBER_OF_RETRIES_TIMEOUT_DETECTION = int(
    getenv("LAVA_NUMBER_OF_RETRIES_TIMEOUT_DETECTION", 2)
 )

-CI_JOB_TIMEOUT_SEC = int(getenv("CI_JOB_TIMEOUT", 3600))
-# How many seconds the script will wait to let LAVA run the job and give the final details.
-EXPECTED_JOB_DURATION_SEC = int(getenv("EXPECTED_JOB_DURATION_SEC", 60 * 10))
-# CI_JOB_STARTED is given by GitLab CI/CD in UTC timezone by default.
-CI_JOB_STARTED_AT_RAW = getenv("CI_JOB_STARTED_AT", "")
-CI_JOB_STARTED_AT: datetime = (
-    datetime.fromisoformat(CI_JOB_STARTED_AT_RAW)
-    if CI_JOB_STARTED_AT_RAW
-    else datetime.now(timezone.utc)
-)
-

 def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
    """
    Investigate infrastructure errors from the job metadata.
-    If it finds an error, raise it as MesaCIRetriableException.
+    If it finds an error, raise it as MesaCIException.
    """
    if "result" not in metadata or metadata["result"] != "fail":
        return
    if "error_type" in metadata:
        error_type = metadata["error_type"]
        if error_type == "Infrastructure":
-            raise MesaCIRetriableException(
+            raise MesaCIException(
                f"LAVA job {job_id} failed with Infrastructure Error. Retry."
            )
        if error_type == "Job":
@@ -113,12 +100,12 @@ def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
            # with mal-formed job definitions. As we are always validating the
            # jobs, only the former is probable to happen. E.g.: When some LAVA
            # action timed out more times than expected in job definition.
-            raise MesaCIRetriableException(
+            raise MesaCIException(
                f"LAVA job {job_id} failed with JobError "
                "(possible LAVA timeout misconfiguration/bug). Retry."
            )
    if "case" in metadata and metadata["case"] == "validate":
-        raise MesaCIRetriableException(
+        raise MesaCIException(
            f"LAVA job {job_id} failed validation (possible download error). Retry."
        )

@@ -195,6 +182,7 @@ def is_job_hanging(job, max_idle_time):


 def parse_log_lines(job, log_follower, new_log_lines):
+
    if log_follower.feed(new_log_lines):
        # If we had non-empty log data, we can assure that the device is alive.
        job.heartbeat()
@@ -212,6 +200,7 @@ def parse_log_lines(job, log_follower, new_log_lines):


 def fetch_new_log_lines(job):
+
    # The XMLRPC binary packet may be corrupted, causing a YAML scanner error.
    # Retry the log fetching several times before exposing the error.
    for _ in range(5):
@@ -227,28 +216,14 @@ def submit_job(job):
    try:
        job.submit()
    except Exception as mesa_ci_err:
-        raise MesaCIRetriableException(
+        raise MesaCIException(
            f"Could not submit LAVA job. Reason: {mesa_ci_err}"
        ) from mesa_ci_err


-def wait_for_job_get_started(job, attempt_no):
+def wait_for_job_get_started(job):
    print_log(f"Waiting for job {job.job_id} to start.")
    while not job.is_started():
-        current_job_duration_sec: int = int(
-            (datetime.now(timezone.utc) - CI_JOB_STARTED_AT).total_seconds()
-        )
-        remaining_time_sec: int = max(0, CI_JOB_TIMEOUT_SEC - current_job_duration_sec)
-        if remaining_time_sec < EXPECTED_JOB_DURATION_SEC:
-            job.cancel()
-            raise MesaCIFatalException(
-                f"{CONSOLE_LOG['BOLD']}"
-                f"{CONSOLE_LOG['FG_YELLOW']}"
-                f"Job {job.job_id} only has {remaining_time_sec} seconds "
-                "remaining to run, but it is expected to take at least "
-                f"{EXPECTED_JOB_DURATION_SEC} seconds."
-                f"{CONSOLE_LOG['RESET']}",
-            )
        time.sleep(WAIT_FOR_DEVICE_POLLING_TIME_SEC)
    job.refresh_log()
    print_log(f"Job {job.job_id} started.")
@@ -324,7 +299,7 @@ def execute_job_with_retries(
        try:
            job_log["submitter_start_time"] = datetime.now().isoformat()
            submit_job(job)
-            wait_for_job_get_started(job, attempt_no)
+            wait_for_job_get_started(job)
            log_follower: LogFollower = bootstrap_log_follower()
            follow_job_execution(job, log_follower)
            return job
@@ -343,8 +318,6 @@ def execute_job_with_retries(
                f"Finished executing LAVA job in the attempt #{attempt_no}"
                f"{CONSOLE_LOG['RESET']}"
            )
-            if job.exception and not isinstance(job.exception, MesaCIRetriableException):
-                break

    return last_failed_job

@@ -388,7 +361,6 @@ class LAVAJobSubmitter(PathResolver):
    boot_method: str
    ci_project_dir: str
    device_type: str
-    farm: str
    job_timeout_min: int  # The job timeout in minutes
    build_url: str = None
    dtb_filename: str = None
@@ -499,9 +471,8 @@ class LAVAJobSubmitter(PathResolver):
        if not last_attempt_job:
            # No job was run, something bad happened
            STRUCTURAL_LOG["job_combined_status"] = "script_crash"
-            current_exception = str(sys.exc_info()[1])
+            current_exception = str(sys.exc_info()[0])
            STRUCTURAL_LOG["job_combined_fail_reason"] = current_exception
-            print(f"Interrupting the script. Reason: {current_exception}")
            raise SystemExit(1)

        STRUCTURAL_LOG["job_combined_status"] = last_attempt_job.status
@@ -517,7 +488,6 @@ class StructuredLoggerWrapper:
    def _init_logger(self):
        STRUCTURAL_LOG["fixed_tags"] = self.__submitter.lava_tags
        STRUCTURAL_LOG["dut_job_type"] = self.__submitter.device_type
-        STRUCTURAL_LOG["farm"] = self.__submitter.farm
        STRUCTURAL_LOG["job_combined_fail_reason"] = None
        STRUCTURAL_LOG["job_combined_status"] = "not_submitted"
        STRUCTURAL_LOG["dut_attempt_counter"] = 0
@@ -539,6 +509,7 @@ class StructuredLoggerWrapper:
    def logger_context(self):
        context = contextlib.nullcontext()
        try:
+
            global STRUCTURAL_LOG
            STRUCTURAL_LOG = StructuredLogger(
                self.__submitter.structured_log_file, truncate=True
--- a/.gitlab-ci/lava/utils/constants.py
+++ b/.gitlab-ci/lava/utils/constants.py
@@ -12,21 +12,3 @@ JOB_PRIORITY = int(getenv("JOB_PRIORITY", 75))
 # Use UART over the default SSH mechanism to follow logs.
 # Caution: this can lead to device silence in some devices in Mesa CI.
 FORCE_UART = bool(getenv("LAVA_FORCE_UART", False))
-
-# How many times the r8152 error may happen to consider it a known issue.
-KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER: int = 10
-KNOWN_ISSUE_R8152_PATTERNS: tuple[str, ...] = (
-    r"r8152 \S+ eth0: Tx status -71",
-    r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
-)
-
-# This is considered noise, since LAVA produces this log after receiving a package of feedback
-# messages.
-LOG_DEBUG_FEEDBACK_NOISE = "Listened to connection for namespace 'dut' done"
-
-A6XX_GPU_RECOVERY_WATCH_PERIOD_MIN = 3
-A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT = 30
-A6XX_GPU_RECOVERY_FAILURE_MESSAGE = (
-    "cx gdsc didn't collapse",
-    "Timeout waiting for GMU OOB",
-)
--- a/.gitlab-ci/lava/utils/lava_job.py
+++ b/.gitlab-ci/lava/utils/lava_job.py
@@ -6,7 +6,6 @@ from typing import Any, Optional

 from lava.exceptions import (
    MesaCIException,
-    MesaCIRetriableException,
    MesaCIKnownIssueException,
    MesaCIParseException,
    MesaCITimeoutError,
@@ -35,7 +34,7 @@ class LAVAJob:
        self._is_finished = False
        self.log: dict[str, Any] = log
        self.status = "not_submitted"
-        self.__exception: Optional[Exception] = None
+        self.__exception: Optional[str] = None

    def heartbeat(self) -> None:
        self.last_log_time: datetime = datetime.now()
@@ -64,13 +63,13 @@ class LAVAJob:
        return self._is_finished

    @property
-    def exception(self) -> Optional[Exception]:
+    def exception(self) -> str:
        return self.__exception

    @exception.setter
    def exception(self, exception: Exception) -> None:
-        self.__exception = exception
-        self.log["dut_job_fail_reason"] = repr(self.__exception)
+        self.__exception = repr(exception)
+        self.log["dut_job_fail_reason"] = self.__exception

    def validate(self) -> Optional[dict]:
        """Returns a dict with errors, if the validation fails.
@@ -177,15 +176,11 @@ class LAVAJob:
            self.status = "canceled"
        elif isinstance(exception, MesaCITimeoutError):
            self.status = "hung"
-        elif isinstance(exception, MesaCIRetriableException):
+        elif isinstance(exception, MesaCIException):
            self.status = "failed"
        elif isinstance(exception, KeyboardInterrupt):
            self.status = "interrupted"
            print_log("LAVA job submitter was interrupted. Cancelling the job.")
            raise
-        elif isinstance(exception, MesaCIException):
-            self.status = "interrupted"
-            print_log("LAVA job submitter was interrupted. Cancelling the job.")
-            raise
        else:
            self.status = "job_submitter_error"
--- a/.gitlab-ci/lava/utils/lava_job_definition.py
+++ b/.gitlab-ci/lava/utils/lava_job_definition.py
@@ -15,8 +15,6 @@ from lava.utils.uart_job_definition import (
    fastboot_deploy_actions,
    tftp_boot_action,
    tftp_deploy_actions,
-    qemu_boot_action,
-    qemu_deploy_actions,
    uart_test_actions,
 )

@@ -34,10 +32,6 @@ class LAVAJobDefinition:

    def __init__(self, job_submitter: "LAVAJobSubmitter") -> None:
        self.job_submitter: "LAVAJobSubmitter" = job_submitter
-        # NFS args provided by LAVA
-        self.lava_nfs_args: str = "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3 ip=dhcp"
-        # extra_nfsroot_args appends to cmdline
-        self.extra_nfsroot_args: str = " init=/init rootwait usbcore.quirks=0bda:8153:k"

    def has_ssh_support(self) -> bool:
        if FORCE_UART:
@@ -61,11 +55,11 @@ class LAVAJobDefinition:
            actions for the LAVA job submission.
        """
        args = self.job_submitter
+        values = self.generate_metadata()
        nfsrootfs = {
            "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
            "compression": "zstd",
        }
-        values = self.generate_metadata()

        init_stage1_steps = self.init_stage1_steps()
        artifact_download_steps = self.artifact_download_steps()
@@ -77,9 +71,6 @@ class LAVAJobDefinition:
        if args.boot_method == "fastboot":
            deploy_actions = fastboot_deploy_actions(self, nfsrootfs)
            boot_action = fastboot_boot_action(args)
-        elif args.boot_method == "qemu-nfs":
-            deploy_actions = qemu_deploy_actions(self, nfsrootfs)
-            boot_action = qemu_boot_action(args)
        else:  # tftp
            deploy_actions = tftp_deploy_actions(self, nfsrootfs)
            boot_action = tftp_boot_action(args)
@@ -126,7 +117,7 @@ class LAVAJobDefinition:
            "device_type": self.job_submitter.device_type,
            "visibility": {"group": [self.job_submitter.visibility_group]},
            "priority": JOB_PRIORITY,
-            "context": {"extra_nfsroot_args": self.extra_nfsroot_args},
+            "context": {"extra_nfsroot_args": " init=/init rootwait usbcore.quirks=0bda:8153:k"},
            "timeouts": {
                "job": {"minutes": self.job_submitter.job_timeout_min},
                "actions": {
@@ -151,10 +142,6 @@ class LAVAJobDefinition:
        if self.job_submitter.lava_tags:
            values["tags"] = self.job_submitter.lava_tags.split(",")

-        # QEMU lava jobs mandate proper arch value in the context
-        if self.job_submitter.boot_method == "qemu-nfs":
-            values["context"]["arch"] = self.job_submitter.mesa_job_name.split(":")[1]
-
        return values

    def attach_kernel_and_dtb(self, deploy_field):
@@ -197,7 +184,7 @@ class LAVAJobDefinition:
                    "set +x  # HIDE_START",
                    f'echo -n "{jwt_file.read()}" > "{self.job_submitter.jwt_file}"',
                    "set -x  # HIDE_END",
-                    f'echo "export S3_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
+                    f'echo "export CI_JOB_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
                ]
        else:
            download_steps += [
@@ -216,13 +203,7 @@ class LAVAJobDefinition:
        #   - exec .gitlab-ci/common/init-stage2.sh

        with open(self.job_submitter.first_stage_init, "r") as init_sh:
-            # For vmware farm, patch nameserver as 8.8.8.8 is off limit.
-            # This is temporary and will be reverted once the farm is moved.
-            if self.job_submitter.mesa_job_name.startswith("vmware-"):
-                run_steps += [x.rstrip().replace("nameserver 8.8.8.8", "nameserver 10.25.198.110") for x in init_sh if not x.startswith("#") and x.rstrip()]
-            else:
-                run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
-
+            run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
        # We cannot distribute the Adreno 660 shader firmware inside rootfs,
        # since the license isn't bundled inside the repository
        if self.job_submitter.device_type == "sm8350-hdk":
--- a/.gitlab-ci/lava/utils/lava_log_hints.py
+++ b/.gitlab-ci/lava/utils/lava_log_hints.py
@@ -1,106 +1,43 @@
 from __future__ import annotations

 import re
-from datetime import datetime, timedelta
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Optional, Sequence
+from typing import TYPE_CHECKING, Any

 if TYPE_CHECKING:
    from lava.utils import LogFollower

 from lava.exceptions import MesaCIKnownIssueException
 from lava.utils.console_format import CONSOLE_LOG
-from lava.utils.constants import (
-    KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER,
-    LOG_DEBUG_FEEDBACK_NOISE,
-    KNOWN_ISSUE_R8152_PATTERNS,
-    A6XX_GPU_RECOVERY_WATCH_PERIOD_MIN,
-    A6XX_GPU_RECOVERY_FAILURE_MESSAGE,
-    A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT,
-)
 from lava.utils.log_section import LogSectionType


-def search_known_issue_patterns(patterns: Sequence[str], line: str) -> str:
-    for pattern in patterns:
-        if re.search(pattern, line):
-            return pattern
-    return ""
-
-
@dataclass
 class LAVALogHints:
    log_follower: LogFollower
-    r8152_issue_consecutive_counter: int = field(default=0, init=False)
-    reboot_counter: int = field(default=0, init=False)
-    a6xx_gpu_recovery_fail_counter: int = field(default=0, init=False)
-    a6xx_gpu_first_fail_time: Optional[datetime] = field(default=None, init=False)
-
-    def raise_known_issue(self, message) -> None:
-        raise MesaCIKnownIssueException(
-            "Found known issue: "
-            f"{CONSOLE_LOG['FG_MAGENTA']}"
-            f"{message}"
-            f"{CONSOLE_LOG['RESET']}"
-        )
+    has_r8152_issue_history: bool = field(default=False, init=False)

    def detect_failure(self, new_lines: list[dict[str, Any]]):
        for line in new_lines:
-            if line["msg"] == LOG_DEBUG_FEEDBACK_NOISE:
-                continue
            self.detect_r8152_issue(line)
-            self.detect_forced_reboot(line)
-            self.detect_a6xx_gpu_recovery_failure(line)

    def detect_r8152_issue(self, line):
-        if self.log_follower.phase in (
-            LogSectionType.LAVA_BOOT,
-            LogSectionType.TEST_CASE,
-        ) and line["lvl"] in ("feedback", "target"):
-            if search_known_issue_patterns(KNOWN_ISSUE_R8152_PATTERNS, line["msg"]):
-                if (
-                    self.r8152_issue_consecutive_counter
-                    < KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER
-                ):
-                    self.r8152_issue_consecutive_counter += 1
-                    return
-
-                self.raise_known_issue(
-                    "Probable network issue failure encountered, retrying the job"
-                )
-
-        # Reset the status, as the `nfs... still trying` complaint was not detected
-        self.r8152_issue_consecutive_counter = 0
-
-    def detect_forced_reboot(self, line: dict[str, Any]) -> None:
        if (
            self.log_follower.phase == LogSectionType.TEST_CASE
-            and line["lvl"] == "feedback"
+            and line["lvl"] == "target"
        ):
-            if re.search(r"^Reboot requested", line["msg"]):
-                self.reboot_counter += 1
+            if re.search(r"r8152 \S+ eth0: Tx status -71", line["msg"]):
+                self.has_r8152_issue_history = True
+                return

-                if self.reboot_counter > 0:
-                    self.raise_known_issue(
-                        "Forced reboot detected during test phase, failing the job..."
-                    )
+            if self.has_r8152_issue_history and re.search(
+                r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
+                line["msg"],
+            ):
+                raise MesaCIKnownIssueException(
+                    f"{CONSOLE_LOG['FG_MAGENTA']}"
+                    "Probable network issue failure encountered, retrying the job"
+                    f"{CONSOLE_LOG['RESET']}"
+                )

-    # If the a6xx gpu repeatedly fails to recover over a short period of time,
-    # then successful recovery is unlikely so cancel the job preemptively.
-    def detect_a6xx_gpu_recovery_failure(self, line: dict[str, Any]) -> None:
-        if search_known_issue_patterns(A6XX_GPU_RECOVERY_FAILURE_MESSAGE, line["msg"]):
-            time_of_failure = datetime.fromisoformat(line["dt"])
-            self.a6xx_gpu_recovery_fail_counter += 1
-
-            if self.a6xx_gpu_first_fail_time is None:
-                self.a6xx_gpu_first_fail_time = time_of_failure
-
-            if self.a6xx_gpu_recovery_fail_counter == A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT:
-                time_since_first_fail = time_of_failure - self.a6xx_gpu_first_fail_time
-                if time_since_first_fail <=  timedelta(minutes=A6XX_GPU_RECOVERY_WATCH_PERIOD_MIN):
-                    self.raise_known_issue(
-                        "Repeated GPU recovery failure detected: cancelling the job"
-                    )
-                else:
-                    self.a6xx_gpu_first_fail_time = None
-                    self.a6xx_gpu_recovery_fail_counter = 0
+        self.has_r8152_issue_history = False
--- a/.gitlab-ci/lava/utils/log_follower.py
+++ b/.gitlab-ci/lava/utils/log_follower.py
@@ -187,25 +187,6 @@ class LogFollower:

        return False

-    def ignore_dut_feedback_lines(self, line: dict[str, str]) -> bool:
-        """
-        Ignores feedback lines from LAVA.
-        If we only receive this level of message for some time, it means that the job is
-        misbehaving. E.g Rebooting.
-
-        Args:
-            line: A dictionary representing a single log line.
-
-        Returns:
-            A boolean indicating whether the current line is a feedback line.
-        """
-        if line["lvl"] == "feedback" and line["ns"] == "dut":
-            return True
-        if line["lvl"] == "debug":
-            # This message happens after LAVA end receiving the feedback from the DUT
-            if line["msg"] == "Listened to connection for namespace 'dut' done":
-                return True
-        return False

    def feed(self, new_lines: list[dict[str, str]]) -> bool:
        """Input data to be processed by LogFollower instance
@@ -226,9 +207,6 @@ class LogFollower:
            if self.merge_carriage_return_lines(line):
                continue

-            if self.ignore_dut_feedback_lines(line):
-                continue
-
            # At least we are fed with a non-kernel dump log, it seems that the
            # job is progressing
            is_job_healthy = True
--- a/.gitlab-ci/lava/utils/uart_job_definition.py
+++ b/.gitlab-ci/lava/utils/uart_job_definition.py
@@ -18,7 +18,6 @@ def fastboot_deploy_actions(
    job_definition: "LAVAJobDefinition", nfsrootfs
 ) -> tuple[dict[str, Any], ...]:
    args = job_definition.job_submitter
-    cmdline = f"{job_definition.lava_nfs_args}{job_definition.extra_nfsroot_args}"
    fastboot_deploy_nfs = {
        "timeout": {"minutes": 10},
        "to": "nfs",
@@ -40,7 +39,7 @@ def fastboot_deploy_actions(
                "steps": [
                    f"cat Image.gz {args.dtb_filename}.dtb > Image.gz+dtb",
                    "mkbootimg --kernel Image.gz+dtb"
-                    + f' --cmdline "{cmdline}"'
+                    + ' --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard rootwait ip=dhcp init=/init"'
                    + " --pagesize 4096 --base 0x80000000 -o boot.img",
                ],
            }
@@ -83,24 +82,6 @@ def tftp_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple
    return (tftp_deploy,)


-def qemu_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple[dict[str, Any]]:
-    args = job_definition.job_submitter
-    qemu_deploy = {
-        "timeout": {"minutes": 5},
-        "to": "nfs",
-        "images": {
-            "kernel": {
-                "image_arg": "-kernel {kernel}",
-                "url": f"{args.kernel_url_prefix}/{args.kernel_image_name}",
-            },
-            "nfsrootfs": nfsrootfs,
-        },
-    }
-    job_definition.attach_external_modules(qemu_deploy)
-
-    return (qemu_deploy,)
-
-
 def uart_test_actions(
    args: "LAVAJobSubmitter", init_stage1_steps: list[str], artifact_download_steps: list[str]
 ) -> tuple[dict[str, Any]]:
@@ -159,16 +140,6 @@ def tftp_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
    return tftp_boot


-def qemu_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
-    qemu_boot = {
-        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-        "method": args.boot_method,
-        "prompts": ["lava-shell:"],
-    }
-
-    return qemu_boot
-
-
 def fastboot_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
    fastboot_boot = {
        "timeout": {"minutes": 2},
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC1003 # works for us now...
 # shellcheck disable=SC2086 # we want word splitting

-section_switch meson-cross-file "meson: cross file generate"
+section_switch meson-configure "meson: configure"

 set -e
 set -o xtrace
@@ -49,38 +49,6 @@ if [ -n "$CROSS" ]; then
    fi
 fi

-if [ -n "$HOST_BUILD_OPTIONS" ]; then
-    section_switch meson-host-configure "meson: host configure"
-
-    # Stash the PKG_CONFIG_LIBDIR so that we can use the base x86_64 image
-    # libraries.
-    tmp_pkg_config_libdir=$PKG_CONFIG_LIBDIR
-    unset PKG_CONFIG_LIBDIR
-
-    # Compile a host version for the few tools we need for a cross build (for
-    # now just intel-clc)
-    rm -rf _host_build
-    meson setup _host_build \
-          --native-file=native.file \
-          -D prefix=/usr \
-          -D libdir=lib \
-          ${HOST_BUILD_OPTIONS}
-
-    pushd _host_build
-
-    section_switch meson-host-build "meson: host build"
-
-    meson configure
-    ninja
-    ninja install
-    popd
-
-    # Restore PKG_CONFIG_LIBDIR
-    if [ -n "$tmp_pkg_config_libdir" ]; then
-        export PKG_CONFIG_LIBDIR=$tmp_pkg_config_libdir
-    fi
-fi
-
 # Only use GNU time if available, not any shell built-in command
 case $CI_JOB_NAME in
    # ASAN leak detection is incompatible with strace
@@ -98,13 +66,11 @@ case $CI_JOB_NAME in
        ;;
 esac

-section_switch meson-configure "meson: configure"
-
 rm -rf _build
 meson setup _build \
      --native-file=native.file \
      --wrap-mode=nofallback \
-      --force-fallback-for perfetto,syn,paste,pest,pest_derive,pest_generator,pest_meta,roxmltree,indexmap \
+      --force-fallback-for perfetto,syn \
      ${CROSS+--cross "$CROSS_FILE"} \
      -D prefix=$PWD/install \
      -D libdir=lib \
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -13,8 +13,7 @@ INSTALL="$PWD/install"
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
 export EGL_PLATFORM=surfaceless
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
+export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"

 RESULTS=$PWD/${PIGLIT_RESULTS_DIR:-results}
 mkdir -p $RESULTS
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -8,17 +8,13 @@ set -ex
 export PAGER=cat  # FIXME: export everywhere

 INSTALL=$(realpath -s "$PWD"/install)
-S3_ARGS="--token-file ${S3_JWT_FILE}"
+S3_ARGS="--token-file ${CI_JOB_JWT_FILE}"

 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"

 export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"

-# FIXME: guess why /usr/local/bin is not included in all runners PATH.
-# Needed because yq and ci-fairy are installed there.
-PATH="/usr/local/bin:$PATH"
-
 if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
    yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
      "$PIGLIT_REPLAY_DESCRIPTION_FILE"
@@ -54,8 +50,7 @@ if [ -n "${VK_DRIVER}" ]; then
  export DXVK_LOG="$RESULTS/dxvk"
  [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
  export DXVK_STATE_CACHE=0
-  ARCH=$(uname -m)
-  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
+  export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 fi

 # Sanity check to ensure that our environment is sufficient to make our tests
@@ -118,7 +113,8 @@ else
      mkdir -p /tmp/.X11-unix

      env \
-        weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
+        VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+	weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &

      while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
    }
@@ -189,15 +185,6 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD &&
 # run.
 rm -rf replayer-db

-# ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
-if [ -n "$PIGLIT_REPLAY_ANGLE_TAG" ]; then
-  ARCH="amd64"
-  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
-  ci-fairy s3cp $S3_ARGS "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" "${FILE}"
-  mkdir -p replayer-db/angle
-  tar --zstd -xf ${FILE} -C replayer-db/angle/
-fi
-
 if ! eval $RUN_CMD;
 then
    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -38,6 +38,7 @@ cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-init.sh install/
 cp -Rp .gitlab-ci/*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
+cp -Rp .gitlab-ci/valve install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 cp -Rp .gitlab-ci/setup-test-env.sh install/
 cp -Rp .gitlab-ci/*-runner.sh install/
@@ -60,7 +61,7 @@ if [ -n "$S3_ARTIFACT_NAME" ]; then
    # Pass needed files to the test stage
    S3_ARTIFACT_NAME="$S3_ARTIFACT_NAME.tar.zst"
    zstd artifacts/install.tar -o ${S3_ARTIFACT_NAME}
-    ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
+    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
 fi

 section_end prepare-artifacts
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH=$LIBDIR

 cd /usr/local/shader-db

-for driver in freedreno intel lima v3d vc4; do
+for driver in freedreno intel v3d vc4; do
    section_start shader-db-${driver} "Running shader-db for $driver"
    env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
@@ -19,14 +19,14 @@ for driver in freedreno intel lima v3d vc4; do
 done

 # Run shader-db over a number of supported chipsets for nouveau
-for chipset in 40 a3 c0 e4 f0 134 162; do
-    section_start shader-db-nouveau-${chipset} "Running shader-db for nouveau - ${chipset}"
-    env LD_PRELOAD="$LIBDIR/libnouveau_noop_drm_shim.so" \
-        NOUVEAU_CHIPSET=${chipset} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt"
-    section_end shader-db-nouveau-${chipset}
-done
+#for chipset in 40 a3 c0 e4 f0 134 162; do
+#    section_start shader-db-nouveau-${chipset} "Running shader-db for nouveau - ${chipset}"
+#    env LD_PRELOAD="$LIBDIR/libnouveau_noop_drm_shim.so" \
+#        NOUVEAU_CHIPSET=${chipset} \
+#        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
+#            > "$ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt"
+#    section_end shader-db-nouveau-${chipset}
+#done

 # Run shader-db for r300 (RV370 and RV515)
 for chipset in 0x5460 0x7140; do
--- a/.gitlab-ci/setup-test-env.sh
+++ b/.gitlab-ci/setup-test-env.sh
@@ -14,14 +14,6 @@ function x_off {

 # TODO: implement x_on !

-export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-
-function get_current_minsec {
-    DATE_S=$(date -u +"%s")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
-}
-
 function error {
    x_off 2>/dev/null
    RED="\e[0;31m"
@@ -29,7 +21,10 @@ function error {
    # we force the following to be not in a section
    section_end $CURRENT_SECTION

-    CURR_MINSEC=$(get_current_minsec)
+    DATE_S=$(date -u +"%s")
+    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
+    CURR_TIME=$((DATE_S-JOB_START_S))
+    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
    echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
    [ "$state_x" -eq 0 ] || set -x
 }
@@ -47,7 +42,10 @@ function build_section_start {
    CYAN="\e[0;36m"
    ENDCOLOR="\e[0m"

-    CURR_MINSEC=$(get_current_minsec)
+    DATE_S=$(date -u +"%s")
+    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
+    CURR_TIME=$((DATE_S-JOB_START_S))
+    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
    echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
 }

@@ -89,7 +87,6 @@ function uncollapsed_section_switch {
 }

 export -f x_off
-export -f get_current_minsec
 export -f error
 export -f trap_err
 export -f build_section_start
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -6,11 +6,6 @@
  rules:
    - if: &is-scheduled-pipeline '$CI_PIPELINE_SOURCE == "schedule"'
      when: on_success
-
-# Override of the `default: retry:` settings, which automatically retries jobs
-# if one of the tests result didn't match its expectation; this override
-# disables that, but keeps the auto-retry for infrastructure failures.
-.no-auto-retry:
  retry:
    max: 1
    # Don't retry on script_failure, job_execution_timeout, runner_unsupported,
@@ -40,7 +35,7 @@
 .restricted-rules:
  rules:
    # If the triggerer has access to the restricted traces and if it is pre-merge
-    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo|kwg|llanderwelin|zmike|vigneshraman)$/") &&
+    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo|kwg|majanes|llanderwelin|zmike|vigneshraman)$/") &&
           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
      when: never

@@ -72,7 +67,7 @@

 # Same core dependencies for doing manual runs.
 .core-manual-rules:
-  extends: .no-auto-retry
+  retry: !reference [.scheduled_pipeline-rules, retry]
  rules:
    # We only want manual jobs to show up when it's not marge's pre-merge CI
    # run, otherwise she'll wait until her timeout.  The exception is
@@ -130,7 +125,7 @@
  extends:
    - .piglit-performance-base
  needs:
-    - debian/baremetal_arm64_test
+    - debian/arm64_test
    - debian-arm64-release

 .piglit-performance:x86_64:
@@ -179,7 +174,7 @@
    - !reference [.gallium-core-rules, rules]

 .gl-manual-rules:
-  extends: .no-auto-retry
+  retry: !reference [.scheduled_pipeline-rules, retry]
  rules:
    - !reference [.core-manual-rules, rules]
    - changes:
@@ -198,7 +193,7 @@
      when: on_success

 .vulkan-manual-rules:
-  extends: .no-auto-retry
+  retry: !reference [.scheduled_pipeline-rules, retry]
  rules:
    - !reference [.core-manual-rules, rules]
    - changes:
@@ -232,10 +227,7 @@
 .lint-rustfmt-rules:
  rules:
    - !reference [.never-post-merge-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes:
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
+    - !reference [.core-rules, rules]
    # in merge pipeline, formatting checks are not allowed to fail
    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
      changes: &rust_file_list
@@ -247,12 +239,24 @@
      when: on_success
      allow_failure: true

-# Rules for .mr-label-maker.yml
-.mr-label-maker-rules:
+.lint-clang-format-rules:
  rules:
    - !reference [.never-post-merge-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        - .mr-label-maker.yml
+    - !reference [.core-rules, rules]
+    # in merge pipeline, formatting checks are not allowed to fail
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes: &clang_format_file_list
+        - .clang-format
+        - .clang-format-include
+        - .clang-format-ignore
+        - src/**/.clang-format
+        - src/egl/**/*
+        - src/amd/vulkan/**/*
+        - src/amd/compiler/**/*
+        - src/etnaviv/isa/**/*
      when: on_success
+      allow_failure: false
+    # in other pipelines, formatting checks are allowed to fail
+    - changes: *clang_format_file_list
+      when: on_success
+      allow_failure: true
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -43,7 +43,21 @@ rustfmt:
    - rustfmt --verbose src/**/lib.rs
    - rustfmt --verbose src/**/main.rs

-python-test:
+clang-format:
+  extends:
+    - .formatting-check
+    - .lint-clang-format-rules
+  variables:
+    LLVM_VERSION: 15
+  before_script:
+    - shopt -s globstar
+    # We need a meson build dir, but its config doesn't actually matter, so
+    # let's just use the default.
+    - meson setup build
+    - clang-format-${LLVM_VERSION} --version
+    - ninja -C build clang-format
+
+.test-check:
  # Cancel job if a newer commit is pushed to the same branch
  interruptible: true
  stage: code-validation
@@ -52,6 +66,10 @@ python-test:
  variables:
    GIT_STRATEGY: fetch
  timeout: 10m
+
+python-test:
+  extends:
+    - .test-check
  script:
    - cd bin/ci
    - pip install --break-system-packages -r test/requirements.txt
@@ -59,18 +77,8 @@ python-test:
  rules:
    - !reference [.disable-farm-mr-rules, rules]
    - !reference [.never-post-merge-rules, rules]
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: on_success
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot"
-      when: on_success
-    - if: $GITLAB_USER_LOGIN == "marge-bot"
-      changes: &bin_ci_files
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
+    - changes:
        - bin/ci/**/*
-      when: on_success
-    - changes: *bin_ci_files
-      when: manual

 .test-gl:
  extends:
@@ -123,11 +131,31 @@ python-test:
    paths:
      - results/

-.b2c-vkd3d-proton-test:
+.vkd3d-proton-test:
+  artifacts:
+    when: on_failure
+    name: "mesa_${CI_JOB_NAME}"
+    paths:
+      - results/vkd3d-proton.log
+  script:
+    - ./install/vkd3d-proton/run.sh
+
+.piglit-test:
+  artifacts:
+    name: "mesa_${CI_JOB_NAME}"
+    paths:
+      - results
+    reports:
+      junit: results/junit.xml
  variables:
-    HWCI_TEST_SCRIPT: ./install/vkd3d-proton/run.sh
+    PIGLIT_NO_WINDOW: 1
+    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
+  script:
+    - install/piglit/piglit-runner.sh

 .piglit-traces-test:
+  extends:
+    - .piglit-test
  artifacts:
    when: on_failure
    name: "mesa_${CI_JOB_NAME}"
@@ -138,11 +166,9 @@ python-test:
    exclude:
      - results/*.shader_cache
  variables:
+    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
    # until we overcome Infrastructure issues, give traces extra 5 min before timeout
    DEVICE_HANGING_TIMEOUT_SEC: 600
-    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE}
-    PIGLIT_NO_WINDOW: 1
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
  script:
    - section_start variables "Variables passed through:"
    - install/common/generate-env.sh
@@ -159,6 +185,12 @@ python-test:
    reports:
      junit: results/junit.xml

+.deqp-test-vk:
+  extends:
+    - .deqp-test
+  variables:
+    DEQP_VER: vk
+
 .fossilize-test:
  script:
    - ./install/fossilize-runner.sh
@@ -168,7 +200,11 @@ python-test:
    paths:
      - results/

-.download_s3:
+.baremetal-test:
+  extends:
+    - .test
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
  before_script:
    - !reference [default, before_script]
    # Use this instead of gitlab's artifacts download because it hits packet.net
@@ -180,14 +216,6 @@ python-test:
    - rm -rf install
    - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
    - section_end artifacts_download
-
-.baremetal-test:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  before_script:
-    - !reference [.download_s3, before_script]
  variables:
    BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
  artifacts:
@@ -205,12 +233,12 @@ python-test:
 .baremetal-test-arm32:
  extends:
    - .baremetal-test
-    - .use-debian/baremetal_arm32_test
+    - .use-debian/arm32_test
  variables:
    DEBIAN_ARCH: armhf
    S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
  needs:
-    - debian/baremetal_arm32_test
+    - debian/arm32_test
    - job: debian-arm32
      artifacts: false
    - !reference [.required-for-hardware-jobs, needs]
@@ -219,12 +247,12 @@ python-test:
 .baremetal-test-arm64:
  extends:
    - .baremetal-test
-    - .use-debian/baremetal_arm64_test
+    - .use-debian/arm64_test
  variables:
    DEBIAN_ARCH: arm64
    S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
  needs:
-    - debian/baremetal_arm64_test
+    - debian/arm64_test
    - job: debian-arm64
      artifacts: false
    - !reference [.required-for-hardware-jobs, needs]
@@ -233,12 +261,12 @@ python-test:
 .baremetal-arm32-asan-test:
  extends:
    - .baremetal-test
-    - .use-debian/baremetal_arm32_test
+    - .use-debian/arm32_test
  variables:
    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
    S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
  needs:
-    - debian/baremetal_arm32_test
+    - debian/arm32_test
    - job: debian-arm32-asan
      artifacts: false
    - !reference [.required-for-hardware-jobs, needs]
@@ -246,12 +274,12 @@ python-test:
 .baremetal-arm64-asan-test:
  extends:
    - .baremetal-test
-    - .use-debian/baremetal_arm64_test
+    - .use-debian/arm64_test
  variables:
    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
  needs:
-    - debian/baremetal_arm64_test
+    - debian/arm64_test
    - job: debian-arm64-asan
      artifacts: false
    - !reference [.required-for-hardware-jobs, needs]
@@ -275,24 +303,28 @@ python-test:
  # built as part of the CI in the boot2container project.
  image: registry.freedesktop.org/gfx-ci/ci-tron/mesa-trigger:2024-01-05.1
  timeout: 1h 40m
+  rules:
+    - if: $FORCE_KERNEL_TAG != null
+      when: never
  variables:
    # No need by default to pull the whole repo
    GIT_STRATEGY: none
    # boot2container initrd configuration parameters.
    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download'  # Linux 6.1
    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/initramfs.linux_amd64.cpio.xz'
-    B2C_JOB_SUCCESS_REGEX: 'hwci: mesa: pass\r$'
+    B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$'
+    B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout'
    B2C_LOG_LEVEL: 6
    B2C_POWEROFF_DELAY: 15
    B2C_SESSION_END_REGEX: '^.*It''s now safe to turn off your computer\r$'
    B2C_SESSION_REBOOT_REGEX: ''
    B2C_TIMEOUT_BOOT_MINUTES: 45
    B2C_TIMEOUT_BOOT_RETRIES: 0
-    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_MINUTES: 2
-    B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
-    B2C_TIMEOUT_CONSOLE_ACTIVITY_MINUTES: 5
+    B2C_TIMEOUT_FIRST_MINUTES: 2
+    B2C_TIMEOUT_FIRST_RETRIES: 3
+    B2C_TIMEOUT_MINUTES: 5
    B2C_TIMEOUT_OVERALL_MINUTES: 90
-    B2C_TIMEOUT_CONSOLE_ACTIVITY_RETRIES: 0
+    B2C_TIMEOUT_RETRIES: 0
    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache,install/*,*/install/*,*/vkd3d-proton.cache*,vkd3d-proton.cache*,*.qpa"

    # As noted in the top description, we make a distinction between the
@@ -385,7 +417,7 @@ python-test:
    reports:
      junit: results/**/junit.xml

-.b2c-x86_64-test-vk:
+.b2c-test-vk:
  extends:
    - .use-debian/x86_64_test-vk
    - .b2c-test
@@ -394,7 +426,7 @@ python-test:
    - debian-testing
    - !reference [.required-for-hardware-jobs, needs]

-.b2c-x86_64-test-gl:
+.b2c-test-gl:
  extends:
    - .use-debian/x86_64_test-gl
    - .b2c-test
@@ -402,21 +434,3 @@ python-test:
    - debian/x86_64_test-gl
    - debian-testing
    - !reference [.required-for-hardware-jobs, needs]
-
-.b2c-arm64-test-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .b2c-test
-  needs:
-    - debian/arm64_test-vk
-    - debian-arm64
-    - !reference [.required-for-hardware-jobs, needs]
-
-.b2c-arm64-test-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .b2c-test
-  needs:
-    - debian/arm64_test-gl
-    - debian-arm64
-    - !reference [.required-for-hardware-jobs, needs]
--- a/.gitlab-ci/tests/test_lava_job_submitter.py
+++ b/.gitlab-ci/tests/test_lava_job_submitter.py
@@ -9,13 +9,12 @@ import os
 import xmlrpc.client
 from contextlib import nullcontext as does_not_raise
 from datetime import datetime
-from itertools import islice, repeat
+from itertools import chain, repeat
 from pathlib import Path
-from typing import Generator
 from unittest.mock import MagicMock, patch

 import pytest
-from lava.exceptions import MesaCIException, MesaCIRetryError, MesaCIFatalException
+from lava.exceptions import MesaCIException, MesaCIRetryError
 from lava.lava_job_submitter import (
    DEVICE_HANGING_TIMEOUT_SEC,
    NUMBER_OF_RETRIES_TIMEOUT_DETECTION,
@@ -24,7 +23,6 @@ from lava.lava_job_submitter import (
    bootstrap_log_follower,
    follow_job_execution,
    retriable_follow_job,
-    wait_for_job_get_started,
 )
 from lava.utils import LogSectionType

@@ -84,7 +82,7 @@ def lava_job_submitter(
 def test_submit_and_follow_respects_exceptions(mock_sleep, mock_proxy, exception):
    with pytest.raises(MesaCIException):
        proxy = mock_proxy(side_effect=exception)
-        job = LAVAJob(proxy, "")
+        job = LAVAJob(proxy, '')
        log_follower = bootstrap_log_follower()
        follow_job_execution(job, log_follower)

@@ -166,13 +164,21 @@ PROXY_SCENARIOS = {
        mock_logs(result="pass"),
        does_not_raise(),
        "pass",
-        {"testsuite_results": [generate_testsuite_result(result="pass")]},
+        {
+            "testsuite_results": [
+                generate_testsuite_result(result="pass")
+            ]
+        },
    ),
    "no retries, but testsuite fails": (
        mock_logs(result="fail"),
        does_not_raise(),
        "fail",
-        {"testsuite_results": [generate_testsuite_result(result="fail")]},
+        {
+            "testsuite_results": [
+                generate_testsuite_result(result="fail")
+            ]
+        },
    ),
    "no retries, one testsuite fails": (
        generate_n_logs(n=1, tick_fn=0, result="fail"),
@@ -181,7 +187,7 @@ PROXY_SCENARIOS = {
        {
            "testsuite_results": [
                generate_testsuite_result(result="fail"),
-                generate_testsuite_result(result="pass"),
+                generate_testsuite_result(result="pass")
            ]
        },
    ),
@@ -258,27 +264,6 @@ def test_simulate_a_long_wait_to_start_a_job(
    assert delta_time.total_seconds() >= wait_time


-LONG_LAVA_QUEUE_SCENARIOS = {
-    "no_time_to_run": (0, pytest.raises(MesaCIFatalException)),
-    "enough_time_to_run": (9999999999, does_not_raise()),
-}
-
-
-@pytest.mark.parametrize(
-    "job_timeout, expectation",
-    LONG_LAVA_QUEUE_SCENARIOS.values(),
-    ids=LONG_LAVA_QUEUE_SCENARIOS.keys(),
-)
-def test_wait_for_job_get_started_no_time_to_run(monkeypatch, job_timeout, expectation):
-    monkeypatch.setattr("lava.lava_job_submitter.CI_JOB_TIMEOUT_SEC", job_timeout)
-    job = MagicMock()
-    # Make it escape the loop
-    job.is_started.side_effect = (False, False, True)
-    with expectation as e:
-        wait_for_job_get_started(job, 1)
-    if e:
-        job.cancel.assert_called_with()
-

 CORRUPTED_LOG_SCENARIOS = {
    "too much subsequent corrupted data": (
@@ -356,15 +341,13 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
        if not data_chunk:
            return

-        first_log = lava_yaml.load(data_chunk[0])[0]
-        first_log_time = first_log["dt"]
+        first_log_time = data_chunk[0]["dt"]
        frozen_time.move_to(first_log_time)
        yield

-        last_log = lava_yaml.load(data_chunk[-1])[0]
-        last_log_time = last_log["dt"]
+        last_log_time = data_chunk[-1]["dt"]
        frozen_time.move_to(last_log_time)
-        yield
+        return

    def time_travel_to_test_time():
        # Suppose that the first message timestamp of the entire LAVA job log is
@@ -374,31 +357,22 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
            first_log_time = lava_yaml.load(first_log)[0]["dt"]
            frozen_time.move_to(first_log_time)

-    def load_lines() -> Generator[tuple[bool, str], None, None]:
+    def load_lines() -> list:
        with open("/tmp/log.yaml", "r") as f:
            # data = yaml.safe_load(f)
-            log_lines = f.readlines()
-            serial_message: str = ""
-            chunk_start_line = 0
-            chunk_end_line = 0
-            chunk_max_size = 100
+            data = f.readlines()
+            stream = chain(data)
            try:
                while True:
-                    chunk_end_line = chunk_start_line + random.randint(1, chunk_max_size)
-                    # split the log in chunks of random size
-                    log_chunk = list(islice(log_lines, chunk_start_line, chunk_end_line))
-                    chunk_start_line = chunk_end_line + 1
-                    serial_message = "".join(log_chunk)
-                    # time_traveller_gen will make the time trave according to the timestamp from
-                    # the message
-                    time_traveller_gen = time_travel_from_log_chunk(log_chunk)
+                    data_chunk = [next(stream) for _ in range(random.randint(0, 50))]
+                    serial_message = "".join(data_chunk)
                    # Suppose that the first message timestamp is the same of
                    # log fetch RPC call
-                    next(time_traveller_gen)
+                    time_travel_from_log_chunk(data_chunk)
                    yield False, "[]"
                    # Travel to the same datetime of the last fetched log line
                    # in the chunk
-                    next(time_traveller_gen)
+                    time_travel_from_log_chunk(data_chunk)
                    yield False, serial_message
            except StopIteration:
                yield True, serial_message
@@ -410,20 +384,11 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
        proxy.scheduler.jobs.logs.side_effect = load_lines()

    proxy.scheduler.jobs.submit = reset_logs
-    try:
+    with pytest.raises(MesaCIRetryError):
        time_travel_to_test_time()
-        start_time = datetime.now()
+        lava_job_submitter.submit()
        retriable_follow_job(proxy, "")
-    finally:
-        try:
-            # If the job fails, maybe there will be no structured log
-            print(lava_job_submitter.structured_log_file.read_text())
-        finally:
-            end_time = datetime.now()
-            print("---- Reproduction log stats ----")
-            print(f"Start time: {start_time}")
-            print(f"End time: {end_time}")
-            print(f"Duration: {end_time - start_time}")
+        print(lava_job_submitter.structured_log_file.read_text())


@pytest.mark.parametrize(
@@ -452,7 +417,9 @@ def test_job_combined_status(
        "lava.lava_job_submitter.retriable_follow_job"
    ) as mock_retriable_follow_job, patch(
        "lava.lava_job_submitter.LAVAJobSubmitter._LAVAJobSubmitter__prepare_submission"
-    ) as mock_prepare_submission, patch("sys.exit"):
+    ) as mock_prepare_submission, patch(
+        "sys.exit"
+    ):
        from lava.lava_job_submitter import STRUCTURAL_LOG

        mock_retriable_follow_job.return_value = MagicMock(status=finished_job_status)
--- a/.gitlab-ci/tests/utils/test_lava_log.py
+++ b/.gitlab-ci/tests/utils/test_lava_log.py
@@ -16,21 +16,8 @@ from lava.utils import (
    fix_lava_gitlab_section_log,
    hide_sensitive_data,
 )
-from lava.utils.constants import (
-    KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER,
-    A6XX_GPU_RECOVERY_WATCH_PERIOD_MIN,
-    A6XX_GPU_RECOVERY_FAILURE_MESSAGE,
-    A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT,
-)
-from lava.utils.lava_log_hints import LAVALogHints

-from ..lava.helpers import (
-    create_lava_yaml_msg,
-    does_not_raise,
-    lava_yaml,
-    mock_lava_signal,
-    yaml_dump,
-)
+from ..lava.helpers import create_lava_yaml_msg, does_not_raise, lava_yaml, yaml_dump

 GITLAB_SECTION_SCENARIOS = {
    "start collapsed": (
@@ -324,56 +311,47 @@ def test_gitlab_section_id(case_name, expected_id):
    assert gl.id == expected_id


-def a618_network_issue_logs(level: str = "target") -> list:
-    net_error = create_lava_yaml_msg(
-            msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl=level)
-
-    nfs_error = create_lava_yaml_msg(
-            msg="[ 1733.604506] nfs: server 192.168.201.1 not responding, still trying",
-            lvl=level,
-        )
-
-    return [
-        *(KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER*[net_error]),
-        nfs_error
-    ]
-
-
-TEST_PHASE_LAVA_SIGNAL = mock_lava_signal(LogSectionType.TEST_CASE)
-A618_NET_ISSUE_BOOT = a618_network_issue_logs(level="feedback")
-A618_NET_ISSUE_TEST = [TEST_PHASE_LAVA_SIGNAL, *a618_network_issue_logs(level="target")]
+A618_NETWORK_ISSUE_LOGS = [
+    create_lava_yaml_msg(
+        msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl="target"
+    ),
+    create_lava_yaml_msg(
+        msg="[ 1733.604506] nfs: server 192.168.201.1 not responding, still trying",
+        lvl="target",
+    ),
+]
+TEST_PHASE_LAVA_SIGNAL = create_lava_yaml_msg(
+    msg="Received signal: <STARTTC> mesa-ci_a618_vk", lvl="debug"
+)


 A618_NETWORK_ISSUE_SCENARIOS = {
-    "Fail - R8152 kmsg during boot phase": (
-        A618_NET_ISSUE_BOOT,
-        pytest.raises(MesaCIKnownIssueException),
-    ),
+    "Pass - R8152 kmsg during boot": (A618_NETWORK_ISSUE_LOGS, does_not_raise()),
    "Fail - R8152 kmsg during test phase": (
-        A618_NET_ISSUE_TEST,
+        [TEST_PHASE_LAVA_SIGNAL, *A618_NETWORK_ISSUE_LOGS],
        pytest.raises(MesaCIKnownIssueException),
    ),
    "Pass - Partial (1) R8152 kmsg during test phase": (
-        A618_NET_ISSUE_TEST[:1],
+        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[0]],
        does_not_raise(),
    ),
    "Pass - Partial (2) R8152 kmsg during test phase": (
-        A618_NET_ISSUE_TEST[:2],
+        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[1]],
        does_not_raise(),
    ),
-    "Pass - Partial (3) subsequent R8152 kmsg during test phase": (
+    "Pass - Partial subsequent (3) R8152 kmsg during test phase": (
        [
            TEST_PHASE_LAVA_SIGNAL,
-            A618_NET_ISSUE_TEST[1],
-            A618_NET_ISSUE_TEST[1],
+            A618_NETWORK_ISSUE_LOGS[0],
+            A618_NETWORK_ISSUE_LOGS[0],
        ],
        does_not_raise(),
    ),
-    "Pass - Partial (4) subsequent nfs kmsg during test phase": (
+    "Pass - Partial subsequent (4) R8152 kmsg during test phase": (
        [
            TEST_PHASE_LAVA_SIGNAL,
-            A618_NET_ISSUE_TEST[-1],
-            A618_NET_ISSUE_TEST[-1],
+            A618_NETWORK_ISSUE_LOGS[1],
+            A618_NETWORK_ISSUE_LOGS[1],
        ],
        does_not_raise(),
    ),
@@ -386,54 +364,6 @@ A618_NETWORK_ISSUE_SCENARIOS = {
    ids=A618_NETWORK_ISSUE_SCENARIOS.keys(),
 )
 def test_detect_failure(messages, expectation):
-    boot_section = GitlabSection(
-        id="lava_boot",
-        header="LAVA boot",
-        type=LogSectionType.LAVA_BOOT,
-        start_collapsed=True,
-    )
-    boot_section.start()
-    lf = LogFollower(starting_section=boot_section)
+    lf = LogFollower()
    with expectation:
        lf.feed(messages)
-
-def test_detect_a6xx_gpu_recovery_failure(frozen_time):
-    log_follower = LogFollower()
-    lava_log_hints = LAVALogHints(log_follower=log_follower)
-    failure_message = {
-        "dt": datetime.now().isoformat(),
-        "msg": A6XX_GPU_RECOVERY_FAILURE_MESSAGE[0],
-        "lvl": "feedback",
-    }
-    with pytest.raises(MesaCIKnownIssueException):
-        for _ in range(A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT):
-            lava_log_hints.detect_a6xx_gpu_recovery_failure(failure_message)
-            # Simulate the passage of time within the watch period
-            frozen_time.tick(1)
-            failure_message["dt"] = datetime.now().isoformat()
-
-def test_detect_a6xx_gpu_recovery_success(frozen_time):
-    log_follower = LogFollower()
-    lava_log_hints = LAVALogHints(log_follower=log_follower)
-    failure_message = {
-        "dt": datetime.now().isoformat(),
-        "msg": A6XX_GPU_RECOVERY_FAILURE_MESSAGE[0],
-        "lvl": "feedback",
-    }
-    # Simulate sending a tolerable number of failure messages
-    for _ in range(A6XX_GPU_RECOVERY_FAILURE_MAX_COUNT - 1):
-        lava_log_hints.detect_a6xx_gpu_recovery_failure(failure_message)
-        frozen_time.tick(1)
-        failure_message["dt"] = datetime.now().isoformat()
-
-    # Simulate the passage of time outside of the watch period
-    frozen_time.tick(60 * A6XX_GPU_RECOVERY_WATCH_PERIOD_MIN + 1)
-    failure_message = {
-        "dt": datetime.now().isoformat(),
-        "msg": A6XX_GPU_RECOVERY_FAILURE_MESSAGE[1],
-        "lvl": "feedback",
-    }
-    with does_not_raise():
-        lava_log_hints.detect_a6xx_gpu_recovery_failure(failure_message)
-    assert lava_log_hints.a6xx_gpu_first_fail_time is None, "a6xx_gpu_first_fail_time is not None"
-    assert lava_log_hints.a6xx_gpu_recovery_fail_counter == 0, "a6xx_gpu_recovery_fail_counter is not 0"
--- a/.gitlab-ci/valve/traces-runner.sh
+++ b/.gitlab-ci/valve/traces-runner.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -ex
+
+if [[ -z "$VK_DRIVER" ]]; then
+    exit 1
+fi
+
+# Useful debug output, you rarely know what envirnoment you'll be
+# running in within container-land, this can be a landmark.
+ls -l
+
+INSTALL=$(realpath -s "$PWD"/install)
+RESULTS=$(realpath -s "$PWD"/results)
+
+# Set up the driver environment.
+# Modifiying here directly LD_LIBRARY_PATH may cause problems when
+# using a command wrapper. Hence, we will just set it when running the
+# command.
+export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
+
+# Sanity check to ensure that our environment is sufficient to make our tests
+# run against the Mesa built by CI, rather than any installed distro version.
+MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
+
+# Force the stdout and stderr streams to be unbuffered in python.
+export PYTHONUNBUFFERED=1
+
+# Set the Vulkan driver to use.
+export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+if [ "${VK_DRIVER}" = "radeon" ]; then
+    # Disable vsync
+    export MESA_VK_WSI_PRESENT_MODE=mailbox
+    export vblank_mode=0
+fi
+
+# Set environment for Wine.
+export WINEDEBUG="-all"
+export WINEPREFIX="/dxvk-wine64"
+export WINEESYNC=1
+
+# Wait for amdgpu to be fully loaded
+sleep 1
+
+# Avoid having to perform nasty command pre-processing to insert the
+# wine executable in front of the test executables. Instead, use the
+# kernel's binfmt support to automatically use Wine as an interpreter
+# when asked to load PE executables.
+# TODO: Have boot2container mount this filesystem for all jobs?
+mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
+
+# Set environment for DXVK.
+export DXVK_LOG_LEVEL="info"
+export DXVK_LOG="$RESULTS/dxvk"
+[ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
+export DXVK_STATE_CACHE=0
+
+# Set environment for replaying traces.
+export PATH="/apitrace-msvc-win64/bin:/gfxreconstruct/build/bin:$PATH"
+
+SANITY_MESA_VERSION_CMD="vulkaninfo"
+
+# Set up the Window System Interface (WSI)
+# TODO: Can we get away with GBM?
+if [ "${TEST_START_XORG:-0}" -eq 1 ]; then
+    "$INSTALL"/common/start-x.sh "$INSTALL"
+    export DISPLAY=:0
+fi
+
+wine64 --version
+
+SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
+
+RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD"
+
+set +e
+if ! eval $RUN_CMD;
+then
+    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
+fi
+set -e
+
+# Just to be sure...
+chmod +x ./valvetraces-run.sh
+./valvetraces-run.sh
--- a/.gitlab-ci/vkd3d-proton/run.sh
+++ b/.gitlab-ci/vkd3d-proton/run.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2035 # FIXME glob

 set -ex

@@ -10,9 +11,6 @@ INSTALL=$(realpath -s "$PWD"/install)

 RESULTS=$(realpath -s "$PWD"/results)

-# Make sure the results folder exists
-mkdir -p "$RESULTS"
-
 # Set up the driver environment.
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
@@ -20,54 +18,71 @@ mkdir -p "$RESULTS"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"


+# Sanity check to ensure that our environment is sufficient to make our tests
+# run against the Mesa built by CI, rather than any installed distro version.
+MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
+
 # Set the Vulkan driver to use.
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
+export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"

 # Set environment for Wine.
 export WINEDEBUG="-all"
 export WINEPREFIX="/vkd3d-proton-wine64"
 export WINEESYNC=1

-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(cat "$INSTALL/VERSION")
-if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION"; then
+# wrapper to supress +x to avoid spamming the log
+quiet() {
+    set +x
+    "$@"
+    set -x
+}
+
+set +e
+if ! vulkaninfo | tee /tmp/version.txt | grep "\"Mesa $MESA_VERSION\(\s\|$\)\"";
+then
    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-    exit 1
+fi
+set -e
+
+if [ -d "$RESULTS" ]; then
+    cd "$RESULTS" && rm -rf ..?* .[!.]* * && cd -
+else
+    mkdir "$RESULTS"
 fi

-printf "%s\n" "Running vkd3d-proton testsuite..."
+quiet printf "%s\n" "Running vkd3d-proton testsuite..."

-if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton-log.txt"; then
+set +e
+if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton.log";
+then
    # Check if the executable finished (ie. no segfault).
-    if ! grep "tests executed" "$RESULTS/vkd3d-proton-log.txt" > /dev/null; then
-        error "Failed, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"
+    if ! grep "tests executed" "$RESULTS/vkd3d-proton.log" > /dev/null; then
+        error printf "%s\n" "Failed, see vkd3d-proton.log!"
        exit 1
    fi

    # Collect all the failures
+    VKD3D_PROTON_RESULTS="${VKD3D_PROTON_RESULTS:-vkd3d-proton-results}"
    RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt"
    mkdir -p .gitlab-ci/vkd3d-proton
-    if ! grep "Test failed" "$RESULTS"/vkd3d-proton-log.txt > "$RESULTSFILE"; then
-      error "Failed to get the list of failing tests, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"
-      exit 1
-    fi
+    grep "Test failed" "$RESULTS"/vkd3d-proton.log > "$RESULTSFILE"

    # Gather the list expected failures
-    if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" ]; then
-        cp "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" \
+    if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS.txt" ]; then
+        cp "$INSTALL/$VKD3D_PROTON_RESULTS.txt" \
           ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
    else
-        printf "%s\n" "$VKD3D_PROTON_RESULTS-vkd3d.txt not found, assuming a \"no failures\" baseline."
        touch ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
    fi

    # Make sure that the failures found in this run match the current expectation
-    if ! diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
-        error "Changes found, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"
+    if ! diff -q ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
+        error printf "%s\n" "Changes found, see vkd3d-proton.log!"
+        quiet diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"
        exit 1
    fi
 fi

+printf "%s\n" "vkd3d-proton execution: SUCCESS"
+
 exit 0
--- a/.gitlab-ci/windows/Dockerfile_build
+++ b/.gitlab-ci/windows/Dockerfile_build
@@ -7,10 +7,6 @@ COPY mesa_deps_vulkan_sdk.ps1 C:\
 RUN C:\mesa_deps_vulkan_sdk.ps1

 COPY mesa_init_msvc.ps1 C:\
-
-COPY mesa_deps_libva.ps1 C:\
-RUN C:\mesa_deps_libva.ps1
-
 COPY mesa_deps_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1

--- a/.gitlab-ci/windows/Dockerfile_test
+++ b/.gitlab-ci/windows/Dockerfile_test
@@ -14,9 +14,6 @@ RUN C:\mesa_deps_rust.ps1

 COPY mesa_init_msvc.ps1 C:\

-COPY mesa_deps_libva.ps1 C:\
-RUN C:\mesa_deps_libva.ps1
-
 COPY mesa_deps_test_piglit.ps1 C:\
 RUN C:\mesa_deps_test_piglit.ps1
 COPY mesa_deps_test_deqp.ps1 c:\
--- a/.gitlab-ci/windows/deqp_runner_run.ps1
+++ b/.gitlab-ci/windows/deqp_runner_run.ps1
@@ -1,4 +1,4 @@
-# VK_DRIVER_FILES environment variable is not used when running with
+# VK_ICD_FILENAMES environment variable is not used when running with
 # elevated privileges. Add a key to the registry instead.
 $hkey_path = "HKLM:\SOFTWARE\Khronos\Vulkan\Drivers\"
 $hkey_name = Join-Path -Path $pwd -ChildPath "_install\share\vulkan\icd.d\dzn_icd.x86_64.json"
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -59,6 +59,7 @@ meson setup `
 -Dopencl-spirv=true `
 -Dmicrosoft-clc=enabled `
 -Dstatic-libclc=all `
+-Dopencl-external-clang-headers=disabled `
 -Dspirv-to-dxil=true `
 -Dbuild-tests=true `
 -Dwerror=true `
@@ -84,6 +85,4 @@ Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir

 Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir

-Copy-Item ".\.gitlab-ci\windows\vainfo_run.ps1" -Destination $installdir
-
 Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Include "*.txt","*.toml" | Copy-Item -Destination $installdir
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"

 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
  Write-Host "Failed to clone DirectX-Headers repository"
  Exit 1
@@ -32,17 +32,16 @@ if (!$buildstatus) {

 Get-Date
 Write-Host "Cloning zlib"
-git clone -b v1.3.1 --depth=1 https://github.com/madler/zlib deps/zlib
+git clone -b v1.2.13 --depth=1 https://github.com/madler/zlib deps/zlib
 if (!$?) {
  Write-Host "Failed to clone zlib repository"
  Exit 1
 }
 Write-Host "Downloading zlib meson build files"
-Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch" -OutFile deps/zlib.zip
+Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch" -OutFile deps/zlib.zip
 Expand-Archive -Path deps/zlib.zip -Destination deps/zlib
 # Wrap archive puts build files in a version subdir
-robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
+Move-Item deps/zlib/zlib-1.2.13/* deps/zlib
 $zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
 Push-Location -Path $zlib_build.FullName
 meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
@@ -55,6 +54,35 @@ if (!$buildstatus) {
  Exit 1
 }

+
+Get-Date
+Write-Host "Cloning libva"
+git clone https://github.com/intel/libva.git deps/libva
+if (!$?) {
+  Write-Host "Failed to clone libva repository"
+  Exit 1
+}
+
+Push-Location -Path ".\deps\libva"
+Write-Host "Checking out libva df3c584bb79d1a1e521372d62fa62e8b1c52ce6c"
+# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
+git checkout 2.17.0
+Pop-Location
+
+Write-Host "Building libva"
+# libva already has a build dir in their repo, use builddir instead
+$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
+Push-Location -Path $libva_build.FullName
+meson .. -Dprefix="$depsInstallPath"
+ninja -j32 install
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile libva"
+  Exit 1
+}
+
 Get-Date
 Write-Host "Cloning LLVM release/15.x"
 git clone -b release/15.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
@@ -96,7 +124,6 @@ cmake ../llvm `
 -DLLVM_ENABLE_DIA_SDK=OFF `
 -DCLANG_BUILD_TOOLS=ON `
 -DLLVM_SPIRV_INCLUDE_TESTS=OFF `
-DLLVM_ENABLE_ZLIB=OFF `
 -Wno-dev && `
 ninja -j32 install
 $buildstatus = $?
@@ -131,12 +158,12 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build

 Get-Date
 Write-Host "Cloning SPIRV-Tools"
-git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
+git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
 if (!$?) {
  Write-Host "Failed to clone SPIRV-Tools repository"
  Exit 1
 }
-git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
+git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
 if (!$?) {
  Write-Host "Failed to clone SPIRV-Headers repository"
  Exit 1
--- a/.gitlab-ci/windows/mesa_deps_choco.ps1
+++ b/.gitlab-ci/windows/mesa_deps_choco.ps1
@@ -68,7 +68,7 @@ Get-Date
 python -m pip install --upgrade pip --progress-bar off
 Write-Host "Installing python packages at:"
 Get-Date
-pip3 install packaging meson mako "numpy < 2.0" pyyaml --progress-bar off
+pip3 install packaging meson mako numpy --progress-bar off
 if (!$?) {
  Write-Host "Failed to install dependencies from pip"
  Exit 1
--- a/.gitlab-ci/windows/mesa_deps_d3d.ps1
+++ b/.gitlab-ci/windows/mesa_deps_d3d.ps1
@@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps"

 Write-Host "Downloading DirectX 12 Agility SDK at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.613.2 -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.610.2 -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 # Copy Agility SDK into mesa-deps\bin\D3D12
 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12'
@@ -18,7 +18,7 @@ Remove-Item -Recurse 'C:\agility'

 Write-Host "Downloading Updated WARP at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.11 -OutFile 'warp.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.7.1 -OutFile 'warp.zip'
 Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
 # Copy WARP into mesa-deps\bin
 Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $depsInstallPath\bin
@@ -27,7 +27,7 @@ Remove-Item -Recurse 'C:\warp'

 Write-Host "Downloading DirectXShaderCompiler release at:"
 Get-Date
-Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2403/dxc_2024_03_07.zip -OutFile 'DXC.zip'
+Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip -OutFile 'DXC.zip'
 Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
 # No more need to get dxil.dll from the VS install
 Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'
--- a/.gitlab-ci/windows/mesa_deps_libva.ps1
+++ b/.gitlab-ci/windows/mesa_deps_libva.ps1
@@ -1,79 +0,0 @@
-# Compiling libva/libva-utils deps
-
-$ProgressPreference = "SilentlyContinue"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
-
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
-$depsInstallPath="C:\mesa-deps"
-
-Write-Host "Cloning libva at:"
-Get-Date
-git clone https://github.com/intel/libva.git deps/libva
-if (!$?) {
-  Write-Host "Failed to clone libva repository"
-  Exit 1
-}
-
-Write-Host "Cloning libva finished at:"
-Get-Date
-
-Write-Host "Building libva at:"
-Get-Date
-
-Push-Location -Path ".\deps\libva"
-Write-Host "Checking out libva..."
-git checkout 2.21.0
-Pop-Location
-
-# libva already has a build dir in their repo, use builddir instead
-$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
-Push-Location -Path $libva_build.FullName
-meson .. -Dprefix="$depsInstallPath"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva"
-  Exit 1
-}
-
-Write-Host "Building libva finished at:"
-Get-Date
-
-Write-Host "Cloning libva-utils at:"
-Get-Date
-git clone https://github.com/intel/libva-utils.git deps/libva-utils
-if (!$?) {
-  Write-Host "Failed to clone libva-utils repository"
-  Exit 1
-}
-
-Write-Host "Cloning libva-utils finished at:"
-Get-Date
-
-Write-Host "Building libva-utils at:"
-Get-Date
-
-Push-Location -Path ".\deps\libva-utils"
-Write-Host "Checking out libva-utils..."
-git checkout 2.21.0
-Pop-Location
-
-Write-Host "Building libva-utils"
-# libva-utils already has a build dir in their repo, use builddir instead
-$libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
-Push-Location -Path $libva_utils_build.FullName
-meson .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_utils_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva-utils"
-  Exit 1
-}
-
-Write-Host "Building libva-utils finished at:"
-Get-Date
--- a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
+++ b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
@@ -53,7 +53,7 @@ New-Item -ItemType Directory -Path "$piglit_source" | Out-Null
 Push-Location -Path $piglit_source
 git init
 git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git
-git fetch --depth 1 origin 814046fe6942eac660ee4a6cc5fcc54011a49945 # of branch main
+git fetch --depth 1 origin b41accc83689966f91217fc5b57dbe06202b8c8c # of branch main
 if (!$?) {
  Write-Host "Failed to fetch Piglit repository"
  Pop-Location
--- a/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
+++ b/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
@@ -2,7 +2,7 @@
 # Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
 # This file needs run in administrator mode

-$env:VULKAN_SDK_VERSION="1.3.275.0"
+$env:VULKAN_SDK_VERSION="1.3.211.0"

 $ProgressPreference = "SilentlyContinue"

--- a/.gitlab-ci/windows/piglit_run.ps1
+++ b/.gitlab-ci/windows/piglit_run.ps1
@@ -1,5 +1,4 @@
 $env:PIGLIT_NO_FAST_SKIP = 1
-$env:PIGLIT_SPIRV_AS_BINARY = "C:\VulkanSDK\$env:VULKAN_SDK_VERSION\Bin\spirv-as.exe"

 Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\bin\opengl32.dll
 Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\bin\libgallium_wgl.dll
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Engestrom	e716b08f86	VERSION: bump for 24.0.0-rc2	2024-01-17 22:28:20 +00:00
Friedrich Vock	9d1a064663	radv/rt: Add workaround to make leaves always active DOOM Eternal builds acceleration structures with inactive primitives and tries to make them active in later AS updates. This is disallowed by the spec and triggers a GPU hang. Fix the hang by working around the bug. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27034> (cherry picked from commit `a9831caa14`)	2024-01-17 21:42:02 +00:00
Boris Brezillon	f7f823c787	panvk: Fix access to unitialized panvk_pipeline_layout::num_sets field Commit `73eecffabd` ("panvk: Use the vk_pipeline_layout base struct") reworked the panvk logic to use vk_pipeline_layout, which contains the number of descriptor set layout referenced by a pipeline layout, thus deprecating panvk_pipeline_layout::num_sets. Make panvk_fill_non_vs_attribs() use vk_pipeline_layout::set_count instead of panvk_pipeline_layout::num_sets and kill the latter so we can't introduce new users. Fixes: `73eecffabd` ("panvk: Use the vk_pipeline_layout base struct") Cc: mesa-stable Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27107> (cherry picked from commit `b18bfed2c5`)	2024-01-17 21:41:44 +00:00
Boris Brezillon	b65d7520f6	panvk: Fix tracing pandecode_next_frame() take a decode context. Passing NULL leads to a NULL deref. Fixes: `56be9a55be` ("pan/decode: handle more than one panfrost_device") Cc: mesa-stable Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27107> (cherry picked from commit `35a02560c8`)	2024-01-17 21:39:08 +00:00
Sviatoslav Peleshko	1246e54f1c	nir: Use alu source components count in nir_alu_srcs_negative_equal When we use source from ALU instruction directly, the default swizzle array should be populated with the same amount of components as the src has. Otherwise, if we use nir_ssa_alu_instr_src_components, it can return the destination components count that is lower than component index actually used in that source. This can lead to false equality between 0 (uninitialized) and 0 (.x) in swizzle comparison below. Fixes: `c6ee46a7` ("nir: Add nir_alu_srcs_negative_equal") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8704 Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22655> (cherry picked from commit `6b0bfdfa9e`)	2024-01-17 21:39:06 +00:00
Erico Nunes	4175b4d547	Revert "ci: lima farm is down" This reverts commit `601b826a5e`. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26905> (cherry picked from commit `8bd4cae768`)	2024-01-17 21:39:02 +00:00
Yonggang Luo	9732d1bdcd	compiler/spirv: The spirv shader is binary, should write in binary mode Fixes: `53265c8798` ("spirv: Add a mechanism for dumping failing shaders") Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26775> (cherry picked from commit `fd11818828`)	2024-01-17 21:39:00 +00:00
Yiwei Zhang	8974222433	vulkan/wsi/wayland: fix returns and avoid leaks for failed swapchain Cc: mesa-stable Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org> Tested-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Ryan Neph <ryanneph@google.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27080> (cherry picked from commit `dc5725ee29`)	2024-01-17 21:38:56 +00:00
Eric Engestrom	ce34ec41cd	ci: fix job dependency error in MRs for bin/ci/* scripts 'debian/x86_64_build' job needs 'debian/x86_64_build-base' job, but 'debian/x86_64_build-base' is not in any previous stage Fixes: `f298a0e709` ("ci: make sure we evaluate the python-test rules first") Fixes: `2c9fdaa830` ("ci: fix python-test dependency error on merge requests") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27042> (cherry picked from commit `2ce0b5ab0a`)	2024-01-17 21:38:53 +00:00
Eric Engestrom	3dabc03b58	.pick_status.json: Update to `10e2dbb63b`	2024-01-17 21:36:44 +00:00
David Rosca	25ae9134dd	radeonsi/vcn: Fix H264 slice header when encoding I frames Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27029> (cherry picked from commit `865abfde63`)	2024-01-16 18:41:37 +00:00
Patrick Lerda	43a00ad0fa	glsl/nir: fix gl_nir_cross_validate_outputs_to_inputs() memory leak For instance, this issue is triggered with vs-to-fs-overlap.shader_test -auto -fbo: Direct leak of 24 byte(s) in 1 object(s) allocated from: #0 0x7fe64f58e9a7 in calloc (/usr/lib64/libasan.so.6+0xb19a7) #1 0x7fe642ca2839 in _mesa_symbol_table_ctor ../src/mesa/program/symbol_table.c:286 #2 0x7fe642ff003d in gl_nir_cross_validate_outputs_to_inputs ../src/compiler/glsl/gl_nir_link_varyings.c:728 #3 0x7fe642d7c7d8 in gl_nir_link_glsl ../src/compiler/glsl/gl_nir_linker.c:1357 #4 0x7fe642be6931 in st_link_glsl_to_nir ../src/mesa/state_tracker/st_glsl_to_nir.cpp:562 #5 0x7fe642be6931 in st_link_shader ../src/mesa/state_tracker/st_glsl_to_nir.cpp:944 #6 0x7fe642acab55 in link_program ../src/mesa/main/shaderapi.c:1336 #7 0x7fe642acab55 in link_program_error ../src/mesa/main/shaderapi.c:1447 #8 0x7fe6424aa389 in _mesa_unmarshal_LinkProgram src/mapi/glapi/gen/marshal_generated2.c:1911 #9 0x7fe641fd912b in glthread_unmarshal_batch ../src/mesa/main/glthread.c:139 #10 0x7fe641f48d48 in util_queue_thread_func ../src/util/u_queue.c:309 #11 0x7fe641fa442a in impl_thrd_routine ../src/c11/impl/threads_posix.c:67 Fixes: `7d1948e9b5` ("glsl: implement cross_validate_outputs_to_inputs() in nir linker") Signed-off-by: Patrick Lerda <patrick9876@free.fr> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27071> (cherry picked from commit `bacace8634`)	2024-01-16 18:41:36 +00:00
Karol Herbst	78fd14d938	rusticl/kernel: run opt/lower_memcpy later to fix a crash nir_opt_memcpy requires explicit types to function properly. So run them after lowering vars to explicit types. Cc: mesa-stable Signed-off-by: Karol Herbst <kherbst@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27068> (cherry picked from commit `f896659894`)	2024-01-16 18:41:35 +00:00
Tatsuyuki Ishi	c5b8590e6d	radv: never set DISABLE_WR_CONFIRM for CP DMA clears and copies This mirrors the changes in `69ff9c16bb` ("radeonsi: never set DISABLE_WR_CONFIRM for CP DMA clears and copies"). Cc: mesa-stable Suggested-by: Vitaliy Triang3l Kuzmin <triang3l@yandex.ru> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27053> (cherry picked from commit `43fb43ba2c`)	2024-01-16 18:41:34 +00:00
Lucas Stach	9888a95130	etnaviv: disable 64bpp render/sampler formats Vivante hardware handles 64bpp render targets and samplers in a odd way by splitting the buffer and using a pair of texture samplers or a pair of MRT outputs to access those resources. This isn't implemented in the driver right now, so we should not advertise support for those formats. CC: mesa-stable Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26982> (cherry picked from commit `e481c1269c`)	2024-01-16 18:41:33 +00:00
Eric Engestrom	05ff891088	.pick_status.json: Update to `ff84aef116`	2024-01-16 18:41:30 +00:00
Tapani Pälli	fc4180339c	anv: check for wa 16013994831 in emit_so_memcpy_end We are toggling preemption on/off during streamout, this is also happening on gfx12 platforms, not just dg2. Cc: mesa-stable Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27002> (cherry picked from commit `36f428f1de`)	2024-01-15 21:57:32 +00:00
Vinson Lee	b39ee4d766	intel/disasm: Remove duplicate variable reg_file Fix defects reported by Coverity Scan. Evaluation order violation (EVALUATION_ORDER) write_write_typo: In reg_file = reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst), reg_file is written twice with the same value. Fixes: `1c92dad5cb` ("intel/disasm: Disassembly support for DPAS") Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27056> (cherry picked from commit `73835874a8`)	2024-01-15 21:57:31 +00:00
Lionel Landwerlin	5b8984f32f	anv: hide vendor ID for The Finals XeSS workaround. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10436 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27057> (cherry picked from commit `a34a113059`)	2024-01-15 21:57:30 +00:00
Lionel Landwerlin	eb3d73073f	intel/aux_map: fix fallback unmapping range on failure Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Fixes: `7c6faa1efe` ("intel/aux_map: introduce ref count of L1 entries") Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27057> (cherry picked from commit `ff6041afdf`)	2024-01-15 21:57:29 +00:00
Jesse Natalie	f19b7d8dfc	mesa: Consider mesa format in addition to internal format for mip/cube completeness Prior to `06b526de`, the mesa format was used for these completeness checks. That was to address the case where a different internal format selected the same mesa format, and the texture shouldn't be considered compatible. But this didn't address the case where the same internal format selected a different mesa format, e.g. because the type passed to the TexImage API was different. An old WGL demo app called TexFilter.exe tries to redefine a mipped RGBA16 texture as RGBA8. This incorrect logic caused Mesa to try to copy the RGBA16 data from the smaller mips into the newly created RGBA8 data, because it thought that the texture was still mip-complete, despite the format changing. Cc: mesa-stable Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27023> (cherry picked from commit `4cb9c77e8e`)	2024-01-15 21:57:28 +00:00
José Roberto de Souza	04ffe4771e	anv: Fix PAT entry for userptr in integrated GPUs Fixes: `060439bdf0` ("anv: Add ANV_BO_ALLOC_IMPORTED") Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27040> (cherry picked from commit `49fe060b5f`)	2024-01-15 21:57:27 +00:00
Yiwei Zhang	0ebdd39d85	venus: populate oom from ring submit alloc failures ring_seqno_valid indicates a successful ring cmd submission, and can be used to avoid invalid reply decoding due to failed submit alloc. Otherwise, the garbled VkResult will mislead into initialization failure instead of oom. Below cts failure is fixed: dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic Fixes: `ec131c6e55` ("venus: use instance allocator for ring allocs") Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27026> (cherry picked from commit `ecd50e70d4`)	2024-01-15 21:57:24 +00:00
Matt Turner	fcd78c5281	util/tests: Disable half-float NaN test on hppa/old-mips Bug: https://bugs.gentoo.org/908079 Fixes: `067023dce2` ("util: Add some unit tests of the half-float conversions.") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26991> (cherry picked from commit `5b7c733902`)	2024-01-15 21:56:38 +00:00
Matt Turner	97ebcff41c	util: Add DETECT_ARCH_HPPA macro Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26991> (cherry picked from commit `0540c9de44`)	2024-01-15 21:56:37 +00:00
Pierre-Eric Pelloux-Prayer	6febac5c96	Revert "ci/radeonsi: disable VA-API testing on raven" This reverts commit `9017852de4`. Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26947> (cherry picked from commit `e2f39e8aca`)	2024-01-15 21:56:36 +00:00
Pierre-Eric Pelloux-Prayer	ab960ee0bf	radeonsi: compute epitch when modifying surf_pitch In the linear case with no mipmaps addrlib sets epitch to surf_pitch - 1 so lets do the same thing here. The change in si_descriptors.c looks like it's papering over a bug but I couldn't find any other changes that wouldn't break at least one use case. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10375 Fixes: `115b61e51f` ("ac/surface: don't oversize surf_size") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26947> (cherry picked from commit `4e76c4ecb4`)	2024-01-15 21:56:10 +00:00
Tatsuyuki Ishi	fc11cbb37e	radv: Recompute max_waves after postprocessing RT config The max waves for RT prolog need to be recalculated after merging the resource usage of all shaders invoked from it. Note that there is no need to panic, as the info was only used to calculate maximum scratch size and with the RT prolog being low footprint, this likely only caused overestimation rather than underestimation. Fixes: `533ec9843e` ("radv: Precompute shader max_waves.") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26998> (cherry picked from commit `63827751e1`)	2024-01-15 21:56:09 +00:00
Mike Blumenkrantz	1f5604ed45	zink: fix separate shader patch variable location adjustment in spirv, these start at location 0, not location 32 fixes #10414 Fixes: `d9942442f2` ("zink: handle patch variable locations for separate shaders better") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26981> (cherry picked from commit `565ee4fafc`)	2024-01-15 21:56:07 +00:00
Lionel Landwerlin	cc677d7c30	anv: fix disabled Wa_14017076903/18022508906 Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Fixes: `d0669f3ede` ("intel/dev: switch defect identifiers to use lineage numbers") Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27008> (cherry picked from commit `695b4a2992`)	2024-01-15 21:56:05 +00:00
Eric Engestrom	f575e2b9f1	ci: make sure we evaluate the python-test rules first Fixes: `2c9fdaa830` ("ci: fix python-test dependency error on merge requests") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26984> (cherry picked from commit `f298a0e709`)	2024-01-15 21:56:02 +00:00
Timur Kristóf	3753919715	radv: Correctly select SDMA support for PRIME blit. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10317 Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27015> (cherry picked from commit `436b89e838`)	2024-01-15 21:56:00 +00:00
Pavel Ondračka	757192b046	r300: fix reusing of color varying slots for generic ones This was broken when I added texcoord support, the problem is that we failed to properly count the number of used fs inputs and thus we failed to make the proper decision when to reuse the color varying slot Also fix the error messages, they were incorrect after the rewrite as well. This fixes a bunch of piglits. Fixes: `d4b8e8a481` Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com> Reviewed-by: Filip Gawin <filip.gawin@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27003> (cherry picked from commit `53c17d85ab`)	2024-01-15 21:55:56 +00:00
Mike Blumenkrantz	02b5a2348d	lavapipe: fix devenv icd filename fixes #10408 cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26985> (cherry picked from commit `465e26dd98`)	2024-01-15 21:55:52 +00:00
Mike Blumenkrantz	3c36933195	lavapipe: use pushconstants2 for dgc Fixes: `ec656e1984` ("lavapipe: maint6") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26977> (cherry picked from commit `bf729063c3`)	2024-01-15 21:55:51 +00:00
Mike Blumenkrantz	ae5c0e6600	vk/cmdbuf: add back deleted maint6 workgraph bits this otherwise breaks workgraph support in lavapipe Fixes: `ec656e1984` ("lavapipe: maint6") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26977> (cherry picked from commit `b6bfa73dc7`)	2024-01-15 21:22:38 +00:00
Eric Engestrom	f1064107e9	.pick_status.json: Mark `0557f0d59c` as denominated	2024-01-15 09:44:39 +00:00
Eric Engestrom	6b4f639474	.pick_status.json: Update to `4fe5f06d40`	2024-01-15 09:43:41 +00:00
Eric Engestrom	26a96af808	VERSION: bump for 24.0.0-rc1	2024-01-11 14:19:21 +00:00