iris: Require a 4K alignment for extra clear color BOs.

Apparently, we've been requiring a 4K alignment for internally allocated
clear color addresses to work around some unknown issues.  There's a
comment to that effect in iris_resource_create_with_modifiers().

When importing a dmabuf and tacking on an additional clear color BO, we
only required an alignment of 1.  This wasn't a problem for a long time
because all BO allocations were naturally aligned to the 4K page size.

However, once we enabled suballocation, we were able to allocate "BOs"
at 256B granularity, making this no longer 4K aligned.  Increase the
alignment requirement to 4K to match the behavior of our normal
allocations and also our previous behavior.

Fixes Piglit's ext_image_dma_buf_import-intel-modifiers.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5482
Fixes: ce2e2296ab ("iris: Suballocate BO using the Gallium pb_slab mechanism")
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13326>

.gitlab-ci.yml

@@ -12,6 +12,9 @@ variables:
   JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
   # reference images stored for traces
   PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${MINIO_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
+  # Individual CI farm status, set to "offline" to disable jobs
+  # running on a particular CI farm (ie. for outages, etc):
+  FD_FARM: "online"
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -27,22 +30,22 @@ include:
   - local: '.gitlab-ci/test-source-dep.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/i915/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/iris/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/panfrost/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/radeonsi/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/panfrost/ci/gitlab-ci.yml'
 
 stages:
   - sanity
   - container
-  - container-2
   - git-archive
   - build-x86_64
   - build-misc
@@ -51,6 +54,7 @@ stages:
   - arm
   - broadcom
   - freedreno
+  - etnaviv
   - software-renderer
   - layered-backends
   - deploy
@@ -202,8 +206,10 @@ test-docs-mr:
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
 
 .set-image:
+  extends:
+    - .incorporate-templates-commit
   variables:
-    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
   image: "$MESA_IMAGE"
 
 .set-image-base-tag:
@@ -211,7 +217,7 @@ test-docs-mr:
     - .set-image
     - .incorporate-base-tag+templates-commit
   variables:
-    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
 
 
 # Build the CI docker images.
@@ -277,7 +283,6 @@ test-docs-mr:
     - .incorporate-base-tag+templates-commit
     # Don't want the .container rules
     - .ci-run-policy
-  stage: container-2
 
 # Debian 11 based x86 build image base
 debian/x86_build-base:
@@ -285,7 +290,7 @@ debian/x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-26-python"
 
 .use-debian/x86_build-base:
   extends:
@@ -387,7 +392,7 @@ debian/android_build:
 debian/x86_test-base:
   extends: debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_test-base "2021-09-28-deqp-runner"
 
 .use-debian/x86_test-base:
   extends:
@@ -404,14 +409,14 @@ debian/x86_test-gl:
   extends: .use-debian/x86_test-base
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
-    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-12-dmabuf"
+    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-2bb5d9ffd79c/linux-v5.13-rc5-for-mesa-ci-2bb5d9ffd79c.tar.bz2"
+    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-2021-10-07-piglit"
 
 # Debian 11 based x86 test image for VK
 debian/x86_test-vk:
   extends: .use-debian/x86_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-10-07-piglit"
 
 # Debian 11 based ARM build image
 debian/arm_build:
@@ -421,7 +426,7 @@ debian/arm_build:
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_build "2021-07-26-python"
 
 .use-debian/arm_build:
   extends:
@@ -456,11 +461,11 @@ fedora/x86_build:
 .kernel+rootfs:
   extends:
     - .ci-run-policy
-  stage: container-2
+  stage: container
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-07-12-dmabuf"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-10-07-piglit"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
@@ -507,7 +512,6 @@ debian/arm_test:
     - .container
     # Don't want the .container rules
     - .ci-run-policy
-  stage: build-misc
   needs:
     - kernel+rootfs_arm64
     - kernel+rootfs_armhf
@@ -515,7 +519,7 @@ debian/arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_test "2021-09-17-deqp"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-debian/arm_test:
@@ -750,7 +754,6 @@ debian-gallium:
   script:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/run-shader-db.sh
-    - src/freedreno/.gitlab-ci/run-fdtools.sh
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -774,6 +777,7 @@ debian-release:
       -D gallium-opencl=disabled
       -D llvm=false
     GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
+    VULKAN_DRIVERS: "amd"
     BUILDTYPE: "release"
     EXTRA_OPTION: >
       -D osmesa=true
@@ -876,7 +880,7 @@ debian-android:
     # Can't do Intel because gen_decoder.c currently requires libexpat, which
     # is not a dependency that AOSP wants to accept.  Can't do Radeon because
     # it requires LLVM, which we don't have an Android build of.
-    # - PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-android/pkgconfig/ CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=intel .gitlab-ci/meson/build.sh
+    - PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/pkgconfig/ CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=intel .gitlab-ci/meson/build.sh
 
 .meson-cross:
   extends:
@@ -931,7 +935,7 @@ debian-arm64:
     - .meson-arm
     - .ci-deqp-artifacts
   variables:
-    VULKAN_DRIVERS: "freedreno,broadcom"
+    VULKAN_DRIVERS: "freedreno,broadcom,panfrost"
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=false
@@ -1245,7 +1249,7 @@ debian-mingw32-x86_64:
   variables:
     PIGLIT_PROFILES: replay
     PIGLIT_REPLAY_UPLOAD_TO_MINIO: 1
-    PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/
+    PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt=${CI_JOB_JWT}
     PIGLIT_JUNIT_RESULTS: 1
 
 .deqp-test:

.gitlab-ci/bare-metal/arm64_a630_gles_others.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# This test script groups together a bunch of fast dEQP variant runs
-# to amortize the cost of rebooting the board.
-
-set -ex
-
-EXIT=0
-
-# Test rendering with the gmem path forced when possible (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/gmem \
-  DEQP_VER=gles31 \
-  DEQP_FRACTION=5 \
-  FD_MESA_DEBUG=nobypass \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# Test rendering with the bypass path forced when possible (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/bypass \
-  DEQP_VER=gles31 \
-  DEQP_FRACTION=5 \
-  FD_MESA_DEBUG=nogmem \
-  GPU_VERSION=freedreno-a630-bypass \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# Test rendering with the UBO-to-constants optimization disabled (~1 minute)
-if ! env \
-  DEQP_RESULTS_DIR=results/nouboopt \
-  DEQP_VER=gles31 \
-  IR3_SHADER_DEBUG=nouboopt \
-  DEQP_CASELIST_FILTER="functional.*ubo" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles3-565nozs mustpass (~20s)
-if ! env \
-  DEQP_RESULTS_DIR=results/gles3-565nozs \
-  DEQP_VER=gles3 \
-  DEQP_CONFIG="rgb565d0s0ms0" \
-  DEQP_VARIANT="565-no-depth-no-stencil" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles31-565nozs mustpass (~1s)
-if ! env \
-  DEQP_RESULTS_DIR=results/gles31-565nozs \
-  DEQP_VER=gles31 \
-  DEQP_CONFIG="rgb565d0s0ms0" \
-  DEQP_VARIANT="565-no-depth-no-stencil" \
-  /install/deqp-runner.sh; then
-    EXIT=1
-fi
-
-# gles3-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles3-multisample \
-#   DEQP_VER=gles3 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
-
-# gles31-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles31-multisample \
-#   DEQP_VER=gles31 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
-
-exit $EXIT

.gitlab-ci/bare-metal/cros_servo_run.py

@@ -126,6 +126,12 @@ class CrosServoRun:
                 self.print_error("Detected cheza power management bus error, restarting run...")
                 return 2
 
+            # If the network device dies, it's probably not graphics's fault, just try again.
+            if re.search("NETDEV WATCHDOG", line):
+                self.print_error(
+                    "Detected network device failure, restarting run...")
+                return 2
+
             # These HFI response errors started appearing with the introduction
             # of piglit runs.  CosmicPenguin says:
             #
@@ -139,6 +145,11 @@ class CrosServoRun:
                 self.print_error("Detected cheza power management bus error, restarting run...")
                 return 2
 
+            if re.search("coreboot.*bootblock starting", line):
+                self.print_error(
+                    "Detected spontaneous reboot, restarting run...")
+                return 2
+
             result = re.search("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":

.gitlab-ci/bare-metal/eth008-power-down.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+relay=$1
+
+if [ -z "$relay" ]; then
+    echo "Must supply a relay arg"
+    exit 1
+fi
+
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay

.gitlab-ci/bare-metal/eth008-power-relay.py

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+
+import sys
+import socket
+
+host = sys.argv[1]
+port = sys.argv[2]
+mode = sys.argv[3]
+relay = sys.argv[4]
+msg = None
+
+if mode == "on":
+    msg = b'\x20'
+else:
+    msg = b'\x21'
+
+msg += int(relay).to_bytes(1, 'big')
+msg += b'\x00'
+
+c = socket.create_connection((host, int(port)))
+c.sendall(msg)
+
+data = c.recv(1)
+c.close()
+
+if data[0] == b'\x01':
+    print('Command failed')
+    sys.exit(1)

.gitlab-ci/bare-metal/eth008-power-up.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+relay=$1
+
+if [ -z "$relay" ]; then
+    echo "Must supply a relay arg"
+    exit 1
+fi
+
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay
+sleep 5
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT on $relay

.gitlab-ci/bare-metal/fastboot_run.py

@@ -83,6 +83,12 @@ class FastbootRun:
                     "Detected kernel soft lockup, restarting run...")
                 return 2
 
+            # If the network device dies, it's probably not graphics's fault, just try again.
+            if re.search("NETDEV WATCHDOG", line):
+                self.print_error(
+                    "Detected network device failure, restarting run...")
+                return 2
+
             result = re.search("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":

.gitlab-ci/bare-metal/telnet-buffer.py

@@ -0,0 +1,41 @@
+#!/usr/bin/python3
+
+# Copyright © 2020 Christian Gmeiner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Tiny script to read bytes from telnet, and write the output to stdout, with a
+# buffer in between so we don't lose serial output from its buffer.
+#
+
+import sys
+import telnetlib
+
+host=sys.argv[1]
+port=sys.argv[2]
+
+tn = telnetlib.Telnet(host, port, 1000000)
+
+while True:
+    bytes = tn.read_some()
+    sys.stdout.buffer.write(bytes)
+    sys.stdout.flush()
+
+tn.close()

.gitlab-ci/common/generate-env.sh

@@ -26,16 +26,17 @@ for var in \
     DEQP_EXPECTED_RENDERER \
     DEQP_FRACTION \
     DEQP_HEIGHT \
-    DEQP_NO_SAVE_RESULTS \
     DEQP_PARALLEL \
     DEQP_RESULTS_DIR \
     DEQP_RUNNER_OPTIONS \
+    DEQP_SUITE \
     DEQP_VARIANT \
     DEQP_VER \
     DEQP_WIDTH \
     DEVICE_NAME \
     DRIVER_NAME \
     EGL_PLATFORM \
+    ETNA_MESA_DEBUG \
     FDO_CI_CONCURRENT \
     FDO_UPSTREAM_REPO \
     FD_MESA_DEBUG \
@@ -56,6 +57,7 @@ for var in \
     MESA_VK_IGNORE_CONFORMANCE_WARNING \
     MINIO_HOST \
     NIR_VALIDATE \
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
     PAN_MESA_DEBUG \
     PIGLIT_FRACTION \
     PIGLIT_JUNIT_RESULTS \

.gitlab-ci/common/init-stage2.sh

@@ -23,6 +23,9 @@ export XDG_CACHE_HOME=/tmp
 export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 
 if [ "$HWCI_FREQ_MAX" = "true" ]; then
+  # Ensure initialization of the DRM device (needed by MSM)
+  head -0 /dev/dri/renderD128
+
   # Disable GPU frequency scaling
   DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true`
   test -z "$DEVFREQ_GOVERNOR" || echo performance > $DEVFREQ_GOVERNOR || true

.gitlab-ci/container/arm.config

@@ -11,6 +11,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 
 CONFIG_DRM=y
+CONFIG_DRM_ETNAVIV=y
 CONFIG_DRM_ROCKCHIP=y
 CONFIG_DRM_PANFROST=y
 CONFIG_DRM_LIMA=y

.gitlab-ci/container/arm64.config

@@ -136,6 +136,7 @@ CONFIG_USB_NET_SMSC95XX=y
 # For amlogic
 CONFIG_MESON_GXL_PHY=y
 CONFIG_MDIO_BUS_MUX_MESON_G12A=y
+CONFIG_DRM_MESON=y
 
 # For Mediatek
 CONFIG_DRM_MEDIATEK=y

.gitlab-ci/container/baremetal_build.sh

@@ -31,5 +31,18 @@ if [[ $arch == "arm64" ]]; then
         wget ${ARTIFACTS_URL}/$DTB
     done
 
+    popd
+elif [[ $arch == "armhf" ]]; then
+    mkdir -p /baremetal-files
+    pushd /baremetal-files
+
+    wget ${ARTIFACTS_URL}/zImage
+
+    DEVICE_TREES="imx6q-cubox-i.dtb"
+
+    for DTB in $DEVICE_TREES; do
+        wget ${ARTIFACTS_URL}/$DTB
+    done
+
     popd
 fi

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

@@ -10,14 +10,14 @@ AOSP_EXTERNAL_ROOT=$CROS_ROOT/aosp/external
 mkdir -p $AOSP_EXTERNAL_ROOT
 PLATFORM2_ROOT=/platform2
 
-PLATFORM2_COMMIT=2079dd5fcd61f1ac39e2fc16595956617f3f1e9e
+PLATFORM2_COMMIT=72e56e66ccf3d2ea48f5686bd1f772379c43628b
 git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/platform2 $PLATFORM2_ROOT
 pushd $PLATFORM2_ROOT
 git checkout $PLATFORM2_COMMIT
 popd
 
 # minijail does not exist in upstream linux distros.
-MINIJAIL_COMMIT=5f9e3001c61626d2863dad91248ba8496c3ef511
+MINIJAIL_COMMIT=debdf5de5a0ae3b667bee2f8fb1f755b0b3f5a6c
 git clone --single-branch --no-checkout https://android.googlesource.com/platform/external/minijail $AOSP_EXTERNAL_ROOT/minijail
 pushd $AOSP_EXTERNAL_ROOT/minijail
 git checkout $MINIJAIL_COMMIT
@@ -26,25 +26,38 @@ cp libminijail.so /usr/lib/x86_64-linux-gnu/
 popd
 
 # Pull the cras library for audio access.
-ADHD_COMMIT=5068bdd18b51de8f2d5bcff754cdecda80de8f44
+ADHD_COMMIT=a1e0869b95c845c4fe6234a7b92fdfa6acc1e809
 git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd
 pushd $THIRD_PARTY_ROOT/adhd
 git checkout $ADHD_COMMIT
 popd
 
-CROSVM_VERSION=f70350ba51e9631e3b7fe711c0296e041a61a499
+# Pull vHost (dataplane for virtio backend drivers)
+VHOST_COMMIT=3091854e27242d09453004b011f701fa29c0b8e8
+git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/third_party/rust-vmm/vhost $THIRD_PARTY_ROOT/rust-vmm/vhost
+pushd $THIRD_PARTY_ROOT/rust-vmm/vhost
+git checkout $VHOST_COMMIT
+popd
+
+CROSVM_VERSION=e42a43d880b0364b55559dbeade3af174f929001
 git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/platform/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  bindgen \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local \
+  $EXTRA_CARGO_ARGS
+
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --locked \
-  --features 'default-no-sandbox gpu x virtio-gpu-next' \
+  --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
   --path . \
   --root /usr/local \
   $EXTRA_CARGO_ARGS
 
 popd
 
-rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd /platform/crosvm
+rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd $THIRD_PARTY_ROOT/rust-vmm /platform/crosvm

.gitlab-ci/container/build-deqp-runner.sh

@@ -4,6 +4,6 @@ set -ex
 
 cargo install --locked deqp-runner \
   -j ${FDO_CI_CONCURRENT:-4} \
-  --version 0.7.2 \
+  --version 0.9.0 \
   --root /usr/local \
   $EXTRA_CARGO_ARGS

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

@@ -6,7 +6,7 @@ git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.2.6.2 \
+    -b vulkan-cts-1.2.7.1 \
     --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
@@ -43,8 +43,10 @@ mv /deqp/modules/egl/deqp-egl-x11 /deqp/modules/egl/deqp-egl
 
 # Copy out the mustpass lists we want.
 mkdir /deqp/mustpass
-cp /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt \
-   /deqp/mustpass/vk-master.txt
+for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt) ; do
+    cat /VK-GL-CTS/external/vulkancts/mustpass/master/$mustpass \
+        >> /deqp/mustpass/vk-master.txt
+done
 
 cp \
     /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \

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

@@ -4,7 +4,7 @@ set -ex
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout 11025faf96df23debbefd3678fe959eaa35a50f0
+git checkout 7d7dd2688c214e1b3c00f37226500cbec4a58efb
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
 cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
 ninja $PIGLIT_BUILD_TARGETS

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

@@ -15,10 +15,10 @@ ln -s /usr/local/bin $HOME/.cargo/bin
 # version of the compiler, rather than whatever the container's Debian comes
 # with.
 #
-# Pick the rust compiler (1.41) available in Debian stable, and pick a specific
+# Pick the rust compiler (1.48) available in Debian stable, and pick a specific
 # snapshot from rustup so the compiler doesn't drift on us.
 wget https://sh.rustup.rs -O - | \
-    sh -s -- -y --default-toolchain 1.41.1-2020-02-27
+    sh -s -- -y --default-toolchain 1.49.0-2020-12-31
 
 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.

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

@@ -10,7 +10,7 @@ ninja -C build install
 popd
 rm -rf /epoxy
 
-VIRGLRENDERER_VERSION=08e11a495429c222f150b6d6f8c4936f2f0e0759
+VIRGLRENDERER_VERSION=f2ab66c6c00065b2944f4cd9d965ee455c535271
 git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git --single-branch --no-checkout /virglrenderer
 pushd /virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"

.gitlab-ci/container/debian/arm_build.sh

@@ -43,7 +43,6 @@ apt-get -y install \
 	llvm-11-dev \
 	meson \
 	pkg-config \
-	python-is-python3 \
 	python3-mako \
 	python3-pil \
 	python3-pip \

.gitlab-ci/container/debian/arm_test.sh

@@ -14,7 +14,6 @@ apt-get install -y --no-remove \
         fastboot \
         netcat \
         procps \
-        python-is-python3 \
         python3-distutils \
         python3-minimal \
         python3-serial \

.gitlab-ci/container/debian/x86_build-base.sh

@@ -58,7 +58,6 @@ apt-get install -y --no-remove \
         make \
         meson \
         pkg-config \
-        python-is-python3 \
         python3-mako \
         python3-pil \
         python3-requests \

.gitlab-ci/container/debian/x86_test-base.sh

@@ -41,7 +41,6 @@ apt-get install -y --no-remove \
       libxkbcommon0 \
       libxrandr2 \
       libxrender1 \
-      python-is-python3 \
       python3-mako \
       python3-numpy \
       python3-packaging \

.gitlab-ci/container/debian/x86_test-gl.sh

@@ -12,7 +12,6 @@ STABLE_EPHEMERAL=" \
       bc \
       bison \
       bzip2 \
-      cargo \
       ccache \
       clang-11 \
       cmake \
@@ -101,6 +100,7 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitl
 
 ############### Build Crosvm
 
+. .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-crosvm.sh
 rm -rf /root/.cargo
 

.gitlab-ci/container/debian/x86_test-vk.sh

@@ -120,6 +120,10 @@ wine \
 
 . .gitlab-ci/container/container_pre_build.sh
 
+############### Build libdrm
+
+. .gitlab-ci/container/build-libdrm.sh
+
 ############### Build parallel-deqp-runner's hang-detection tool
 
 . .gitlab-ci/container/build-hang-detection.sh
@@ -146,10 +150,6 @@ setup_wine "/vkd3d-proton-wine64"
 
 . .gitlab-ci/container/build-vkd3d-proton.sh
 
-############### Build libdrm
-
-. .gitlab-ci/container/build-libdrm.sh
-
 ############### Uninstall the build software
 
 ccache --show-stats

.gitlab-ci/container/lava_build.sh

@@ -27,7 +27,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     KERNEL_ARCH="arm64"
     DEFCONFIG="arch/arm64/configs/defconfig"
     DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
@@ -39,7 +39,9 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     GCC_ARCH="arm-linux-gnueabihf"
     KERNEL_ARCH="arm"
     DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
-    DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
+    DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb"
+    DEVICE_TREES+=" arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
+    DEVICE_TREES+=" arch/arm/boot/dts/imx6q-cubox-i.dtb"
     KERNEL_IMAGE_NAME="zImage"
     . .gitlab-ci/container/create-cross-file.sh armhf
 else

.gitlab-ci/crosvm-init.sh

@@ -18,6 +18,8 @@ if sh $CROSVM_TEST_SCRIPT; then
     touch /results/success
 fi
 
+sleep 5   # Leave some time to get the last output flushed out
+
 poweroff -d -n -f || true
 
 sleep 10   # Just in case init would exit before the kernel shuts down the VM

.gitlab-ci/crosvm-runner.sh

@@ -9,6 +9,7 @@ export EGL_PLATFORM=surfaceless
 
 export -p > /crosvm-env.sh
 export GALLIUM_DRIVER="$CROSVM_GALLIUM_DRIVER"
+export GALLIVM_PERF="nopt"
 export LIBGL_ALWAYS_SOFTWARE="true"
 
 CROSVM_KERNEL_ARGS="root=my_root rw rootfstype=virtiofs loglevel=3 init=$CI_PROJECT_DIR/install/crosvm-init.sh ip=192.168.30.2::192.168.30.1:255.255.255.0:crosvm:eth0"
@@ -29,10 +30,13 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 # Crosvm wants this
 syslogd > /dev/null
 
+# We aren't testing LLVMPipe here, so we don't need to validate NIR on the host
+export NIR_VALIDATE=0
+
 crosvm run \
-  --gpu gles=false,backend=3d,egl=true,surfaceless=true \
+  --gpu "$CROSVM_GPU_ARGS" \
   -m 4096 \
-  -c 4 \
+  -c $((FDO_CI_CONCURRENT > 1 ? FDO_CI_CONCURRENT - 1 : 1)) \
   --disable-sandbox \
   --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
   --host_ip=192.168.30.1 --netmask=255.255.255.0 --mac "AA:BB:CC:00:00:12" \

.gitlab-ci/deqp-runner.sh

@@ -47,47 +47,51 @@ HANG_DETECTION_CMD=""
 
 # Generate test case list file.
 if [ "$DEQP_VER" = "vk" ]; then
-   cp /deqp/mustpass/vk-$DEQP_VARIANT.txt /tmp/case-list.txt
+   MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
    DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
    HANG_DETECTION_CMD="/parallel-deqp-runner/build/bin/hang-detection"
 elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" -o "$DEQP_VER" = "egl" ]; then
-   cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt
+   MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
    DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
    SUITE=dEQP
 elif [ "$DEQP_VER" = "gles2-khr" -o "$DEQP_VER" = "gles3-khr" -o "$DEQP_VER" = "gles31-khr" -o "$DEQP_VER" = "gles32-khr" ]; then
-   cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt
+   MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
    DEQP=/deqp/external/openglcts/modules/glcts
    SUITE=dEQP
 else
-   cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt
+   MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
    DEQP=/deqp/external/openglcts/modules/glcts
    SUITE=KHR
 fi
 
-# If the caselist is too long to run in a reasonable amount of time, let the job
-# specify what fraction (1/n) of the caselist we should run.  Note: N~M is a gnu
-# sed extension to match every nth line (first line is #1).
-if [ -n "$DEQP_FRACTION" ]; then
-   sed -ni 1~$DEQP_FRACTION"p" /tmp/case-list.txt
-fi
+if [ -z "$DEQP_SUITE" ]; then
+    cp $MUSTPASS /tmp/case-list.txt
 
-# If the job is parallel at the gitab job level, take the corresponding fraction
-# of the caselist.
-if [ -n "$CI_NODE_INDEX" ]; then
-   sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
-fi
+    # If the caselist is too long to run in a reasonable amount of time, let the job
+    # specify what fraction (1/n) of the caselist we should run.  Note: N~M is a gnu
+    # sed extension to match every nth line (first line is #1).
+    if [ -n "$DEQP_FRACTION" ]; then
+       sed -ni 1~$DEQP_FRACTION"p" /tmp/case-list.txt
+    fi
 
-if [ -n "$DEQP_CASELIST_FILTER" ]; then
-    sed -ni "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
-fi
+    # If the job is parallel at the gitab job level, take the corresponding fraction
+    # of the caselist.
+    if [ -n "$CI_NODE_INDEX" ]; then
+       sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
+    fi
 
-if [ -n "$DEQP_CASELIST_INV_FILTER" ]; then
-    sed -ni "/$DEQP_CASELIST_INV_FILTER/!p" /tmp/case-list.txt
-fi
+    if [ -n "$DEQP_CASELIST_FILTER" ]; then
+        sed -ni "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
+    fi
 
-if [ ! -s /tmp/case-list.txt ]; then
-    echo "Caselist generation failed"
-    exit 1
+    if [ -n "$DEQP_CASELIST_INV_FILTER" ]; then
+        sed -ni "/$DEQP_CASELIST_INV_FILTER/!p" /tmp/case-list.txt
+    fi
+
+    if [ ! -s /tmp/case-list.txt ]; then
+        echo "Caselist generation failed"
+        exit 1
+    fi
 fi
 
 if [ -e "$INSTALL/deqp-$GPU_VERSION-fails.txt" ]; then
@@ -97,8 +101,21 @@ fi
 # Default to an empty known flakes file if it doesn't exist.
 touch $INSTALL/deqp-$GPU_VERSION-flakes.txt
 
+
+if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/deqp-$VK_DRIVER-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$VK_DRIVER-skips.txt"
+fi
+
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/deqp-$GALLIUM_DRIVER-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GALLIUM_DRIVER-skips.txt"
+fi
+
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/deqp-$DRIVER_NAME-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$DRIVER_NAME-skips.txt"
+fi
+
 if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then
-    DEQP_SKIPS="$INSTALL/deqp-$GPU_VERSION-skips.txt"
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GPU_VERSION-skips.txt"
 fi
 
 set +e
@@ -111,30 +128,6 @@ else
    JOB="--jobs 4"
 fi
 
-# If this CI lab lacks artifacts support, print the whole list of failures/flakes.
-if [ -n "$DEQP_NO_SAVE_RESULTS" ]; then
-   SUMMARY_LIMIT="--summary-limit 0"
-fi
-
-run_cts() {
-    deqp=$1
-    caselist=$2
-    output=$3
-    deqp-runner \
-        run \
-        --deqp $deqp \
-        --output $RESULTS \
-        --caselist $caselist \
-        --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
-        --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
-        --testlog-to-xml  /deqp/executor/testlog-to-xml \
-        $JOB \
-        $SUMMARY_LIMIT \
-	$DEQP_RUNNER_OPTIONS \
-        -- \
-        $DEQP_OPTIONS
-}
-
 parse_renderer() {
     RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
     VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
@@ -197,7 +190,7 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
     fi
 
     GALLIUM_DRIVER=llvmpipe \
-    GALLIVM_PERF="nopt,no_filter_hacks" \
+    GALLIVM_PERF="nopt" \
     virgl_test_server $VTEST_ARGS >$RESULTS/vtest-log.txt 2>&1 &
 
     sleep 1
@@ -214,7 +207,35 @@ FAILURES_CSV=$RESULTS/failures.csv
 
 export LD_PRELOAD=$TEST_LD_PRELOAD
 
-run_cts $DEQP /tmp/case-list.txt $RESULTS_CSV
+if [ -z "$DEQP_SUITE" ]; then
+    deqp-runner \
+        run \
+        --deqp $DEQP \
+        --output $RESULTS \
+        --caselist /tmp/case-list.txt \
+        --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
+        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        $JOB \
+        $SUMMARY_LIMIT \
+	$DEQP_RUNNER_OPTIONS \
+        -- \
+        $DEQP_OPTIONS
+else
+    deqp-runner \
+        suite \
+        --suite $INSTALL/deqp-$DEQP_SUITE.toml \
+        --output $RESULTS \
+        --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
+        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        --fraction-start $CI_NODE_INDEX \
+        --fraction $CI_NODE_TOTAL \
+        $JOB \
+        $SUMMARY_LIMIT \
+	$DEQP_RUNNER_OPTIONS
+fi
+
 DEQP_EXITCODE=$?
 
 export LD_PRELOAD=

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

@@ -6,7 +6,6 @@
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     DEQP_PARALLEL: 6 # should be replaced by per-machine definitions
-    DEQP_NO_SAVE_RESULTS: 1 # but why not ... ?
     DEQP_VER: gles2
     # proxy used to cache data locally
     FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
@@ -19,6 +18,7 @@
     JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
     JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz"
     PIGLIT_NO_WINDOW: 1
+    VISIBILITY_GROUP: "Collabora+fdo"
   script:
     - ./artifacts/lava/lava-submit.sh
   artifacts:

.gitlab-ci/lava/lava-submit.sh

@@ -42,4 +42,5 @@ artifacts/lava/lava_job_submitter.py \
 	--kernel-image-name ${KERNEL_IMAGE_NAME} \
 	--kernel-image-type "${KERNEL_IMAGE_TYPE}" \
 	--boot-method ${BOOT_METHOD} \
+	--visibility-group ${VISIBILITY_GROUP} \
 	--lava-tags "${LAVA_TAGS}" >> results/lava.log

.gitlab-ci/lava/lava_job_submitter.py

@@ -34,9 +34,23 @@ import urllib.parse
 import xmlrpc
 import yaml
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from lavacli.utils import loader
 
+# Timeout in minutes 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_MIN = 5
+
+# 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.
+WAIT_FOR_DEVICE_POLLING_TIME_SEC = 10
+
+# How many seconds to wait between log output LAVA RPC calls.
+LOG_POLLING_TIME_SEC = 5
+
+# How many retries should be made when a timeout happen.
+NUMBER_OF_RETRIES_TIMEOUT_DETECTION = 2
+
 
 def print_log(msg):
     print("{}: {}".format(datetime.now(), msg))
@@ -50,7 +64,7 @@ def generate_lava_yaml(args):
     values = {
         'job_name': 'mesa: {}'.format(args.pipeline_info),
         'device_type': args.device_type,
-        'visibility': { 'group': [ 'Collabora+fdo'] },
+        'visibility': { 'group': [ args.visibility_group ] },
         'priority': 75,
         'context': {
             'extra_nfsroot_args': ' init=/init rootwait minio_results={}'.format(args.job_artifacts_base)
@@ -112,7 +126,7 @@ def generate_lava_yaml(args):
             'format': 'Lava-Test Test Definition 1.0',
           },
           'parse': {
-            'pattern': 'hwci: (?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
+            'pattern': r'hwci: (?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
           },
           'run': {
           },
@@ -210,19 +224,44 @@ def get_job_results(proxy, job_id, test_suite, test_case):
 
     return True
 
+def wait_until_job_is_started(proxy, job_id):
+    print_log(f"Waiting for job {job_id} to start.")
+    current_state = "Submitted"
+    waiting_states = ["Submitted", "Scheduling", "Scheduled"]
+    while current_state in waiting_states:
+        job_state = _call_proxy(proxy.scheduler.job_state, job_id)
+        current_state = job_state["job_state"]
+
+        time.sleep(WAIT_FOR_DEVICE_POLLING_TIME_SEC)
+    print_log(f"Job {job_id} started.")
 
 def follow_job_execution(proxy, job_id):
     line_count = 0
     finished = False
+    last_time_logs = datetime.now()
     while not finished:
         (finished, data) = _call_proxy(proxy.scheduler.jobs.logs, job_id, line_count)
         logs = yaml.load(str(data), Loader=loader(False))
         if logs:
+            # Reset the timeout
+            last_time_logs = datetime.now()
             for line in logs:
                 print("{} {}".format(line["dt"], line["msg"]))
 
             line_count += len(logs)
 
+        else:
+            time_limit = timedelta(minutes=DEVICE_HANGING_TIMEOUT_MIN)
+            if datetime.now() - last_time_logs > time_limit:
+                print_log("LAVA job {} doesn't advance (machine got hung?). Retry.".format(job_id))
+                return False
+
+        # `proxy.scheduler.jobs.logs` does not block, even when there is no
+        # new log to be fetched. To avoid dosing the LAVA dispatcher
+        # machine, let's add a sleep to save them some stamina.
+        time.sleep(LOG_POLLING_TIME_SEC)
+
+    return True
 
 def show_job_data(proxy, job_id):
     show = _call_proxy(proxy.scheduler.jobs.show, job_id)
@@ -257,13 +296,22 @@ def main(args):
         print("LAVA job definition validated successfully")
         return
 
+    retry_count = NUMBER_OF_RETRIES_TIMEOUT_DETECTION
 
-    while True:
+    while retry_count >= 0:
         job_id = submit_job(proxy, yaml_file)
 
         print_log("LAVA job id: {}".format(job_id))
 
-        follow_job_execution(proxy, job_id)
+        wait_until_job_is_started(proxy, job_id)
+
+        if not follow_job_execution(proxy, job_id):
+            print_log(f"Job {job_id} has timed out. Cancelling it.")
+            # Cancel the job as it is considered unreachable by Mesa CI.
+            proxy.scheduler.jobs.cancel(job_id)
+
+            retry_count -= 1
+            continue
 
         show_job_data(proxy, job_id)
 
@@ -295,6 +343,7 @@ if __name__ == '__main__':
     parser.add_argument("--jwt")
     parser.add_argument("--validate-only", action='store_true')
     parser.add_argument("--dump-yaml", action='store_true')
+    parser.add_argument("--visibility-group")
 
     parser.set_defaults(func=main)
     args = parser.parse_args()

.gitlab-ci/piglit/piglit-runner.sh

@@ -35,8 +35,20 @@ fi
 # Default to an empty known flakes file if it doesn't exist.
 touch $INSTALL/piglit-$GPU_VERSION-flakes.txt
 
+if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/piglit-$VK_DRIVER-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$VK_DRIVER-skips.txt"
+fi
+
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/piglit-$GALLIUM_DRIVER-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GALLIUM_DRIVER-skips.txt"
+fi
+
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/piglit-$DRIVER_NAME-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$DRIVER_NAME-skips.txt"
+fi
+
 if [ -e "$INSTALL/piglit-$GPU_VERSION-skips.txt" ]; then
-    PIGLIT_SKIPS="$INSTALL/piglit-$GPU_VERSION-skips.txt"
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GPU_VERSION-skips.txt"
 fi
 
 set +e

.gitlab-ci/piglit/run.sh

@@ -107,7 +107,7 @@ else
 
             LD_LIBRARY_PATH="$__LD_LIBRARY_PATH" \
             GALLIUM_DRIVER=llvmpipe \
-            GALLIVM_PERF="nopt,no_filter_hacks" \
+            GALLIVM_PERF="nopt" \
             VTEST_USE_EGL_SURFACELESS=1 \
             VTEST_USE_GLES=1 \
             virgl_test_server >"$RESULTS"/vtest-log.txt 2>&1 &
@@ -160,18 +160,6 @@ replay_minio_upload_images() {
         else
             __MINIO_PATH="$JOB_ARTIFACTS_BASE"
             __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}"
-            # Adding to the JUnit the direct link to the diff page in
-            # the dashboard
-            __PIGLIT_TESTCASE_CLASSNAME="piglit\.trace\.$PIGLIT_REPLAY_DEVICE_NAME\.$(dirname $__TRACE | sed 's%/%\\.%g;s@%@\\%@')"
-            __PIGLIT_TESTCASE_NAME="$(basename $__TRACE | sed 's%\.%_%g;s@%@\\%@')"
-            __DASHBOARD_URL="https://tracie.freedesktop.org/dashboard/imagediff/${CI_PROJECT_PATH}/${CI_JOB_ID}/${__TRACE}"
-            __START_TEST_PATTERN='<testcase classname="'"${__PIGLIT_TESTCASE_CLASSNAME}"'" name="'"${__PIGLIT_TESTCASE_NAME}"'" status="fail"'
-            __REPLACE_TEST_PATTERN='</system-out><failure type="fail"/></testcase>'
-            # Replace in the range between __START_TEST_PATTERN and
-            # __REPLACE_TEST_PATTERN leaving __START_TEST_PATTERN out
-            # from the substitution
-            sed '\%'"${__START_TEST_PATTERN}"'%,\%'"${__REPLACE_TEST_PATTERN}"'%{\%'"${__START_TEST_PATTERN}"'%b;s%'"${__REPLACE_TEST_PATTERN}"'%</system-out><failure type="fail">To view the image differences visit: '"${__DASHBOARD_URL}"'</failure></testcase>%}' \
-                -i "$RESULTS"/junit.xml
         fi
 
         ci-fairy minio cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \
@@ -212,6 +200,11 @@ fi
 
 FAILURE_MESSAGE=$(printf "%s" "Unexpected change in results:")
 
+if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
+       && [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
+    ci-fairy minio login $MINIO_ARGS $CI_JOB_JWT
+fi
+
 eval $RUN_CMD
 
 if [ $? -ne 0 ]; then
@@ -237,8 +230,6 @@ mkdir -p .gitlab-ci/piglit
 if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
        && [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
 
-    ci-fairy minio login $MINIO_ARGS $CI_JOB_JWT
-
     __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
     __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
     __MINIO_TRACES_PREFIX="traces"

.gitlab-ci/prepare-artifacts.sh

@@ -18,7 +18,7 @@ if [ -n "$CROSS" ]; then
 else
     STRIP="strip"
 fi
-if [ -z "$ARTIFACTS_DEBUG_SYMBOLS"]; then
+if [ -z "$ARTIFACTS_DEBUG_SYMBOLS" ]; then
     find install -name \*.so -exec $STRIP {} \;
 fi
 
@@ -38,6 +38,7 @@ cp -Rp .gitlab-ci/deqp-*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 find . -path \*/ci/\*.txt \
+    -o -path \*/ci/\*.toml \
     -o -path \*/ci/\*traces\*.yml \
     | xargs -I '{}' cp -p '{}' install/
 

.gitlab-ci/test-source-dep.yml

@@ -151,6 +151,39 @@
 .freedreno-rules:
   stage: freedreno
   rules:
+    - if: '$FD_FARM == "offline"'
+      when: never
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+        *vulkan_file_list
+      when: on_success
+    - changes: &freedreno_file_list
+      # Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
+      # is supported, we can change the src/freedreno/ rule to explicitly
+      # exclude tools
+      - src/freedreno/**/*
+      - src/gallium/drivers/freedreno/**/*
+      - src/gallium/winsys/freedreno/**/*
+      when: on_success
+    - when: never
+
+# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
+# rules duplication manually
+.freedreno-rules-restricted:
+  stage: freedreno
+  rules:
+    - if: '$FD_FARM == "offline"'
+      when: never
+    # 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)$/") &&
+           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME)'
+      when: never
     - *ignore_scheduled_pipelines
     - changes:
         *mesa_core_file_list
@@ -162,15 +195,35 @@
         *vulkan_file_list
       when: on_success
     - changes:
-      # Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
-      # is supported, we can change the src/freedreno/ rule to explicitly
-      # exclude tools
-      - src/freedreno/**/*
-      - src/gallium/drivers/freedreno/**/*
-      - src/gallium/winsys/freedreno/**/*
+        *freedreno_file_list
       when: on_success
     - when: never
 
+# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
+# rules duplication manually
+.freedreno-rules-performance:
+  stage: freedreno
+  rules:
+    - if: '$FD_FARM == "offline"'
+      when: never
+    - *ignore_scheduled_pipelines
+    # Run only on pre-merge pipelines from Marge
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+      when: never
+    - changes:
+        *mesa_core_file_list
+      when: manual
+    - changes:
+        *gallium_core_file_list
+      when: manual
+    - changes:
+        *vulkan_file_list
+      when: manual
+    - changes:
+        *freedreno_file_list
+      when: manual
+    - when: never
+
 .panfrost-midgard-rules:
   stage: arm
   rules:
@@ -186,6 +239,7 @@
       - src/gallium/winsys/panfrost/**/*
       when: on_success
     - changes: &panfrost_common_file_list
+      - src/panfrost/ci/*
       - src/panfrost/include/*
       - src/panfrost/lib/*
       - src/panfrost/shared/*
@@ -212,6 +266,12 @@
     - changes:
         *panfrost_gallium_file_list
       when: on_success
+    - changes:
+        *vulkan_file_list
+      when: on_success
+    - changes: &panfrost_vulkan_file_list
+      - src/panfrost/vulkan/*
+      when: on_success
     - changes:
       - src/panfrost/bifrost/**/*
       when: on_success
@@ -365,13 +425,33 @@
     - changes:
         *gallium_core_file_list
       when: on_success
-    - changes:
+    - changes: &iris_file_list
       - src/gallium/drivers/iris/**/*
       - src/gallium/winsys/iris/**/*
       - src/intel/**/*
       when: on_success
     - when: never
 
+# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
+# rules duplication manually
+.iris-rules-performance:
+  stage: intel
+  rules:
+    - *ignore_scheduled_pipelines
+    # Run only on pre-merge pipelines from Marge
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+      when: never
+    - changes:
+        *mesa_core_file_list
+      when: manual
+    - changes:
+        *gallium_core_file_list
+      when: manual
+    - changes:
+        *iris_file_list
+      when: manual
+    - when: never
+
 .anv-rules:
   stage: intel
   rules:
@@ -457,6 +537,26 @@
       when: on_success
     - when: never
 
+.etnaviv-rules:
+  stage: etnaviv
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+      - src/etnaviv/**/*
+      - src/gallium/drivers/etnaviv/**/*
+      - src/gallium/winsys/etnaviv/**/*
+      - src/gallium/auxiliary/renderonly/**/*
+      - src/gallium/winsys/kmsro/**/*
+      - src/gallium/winsys/etnaviv/**/*
+      when: on_success
+    - when: never
+
 # Rules for unusual architectures that only build a subset of drivers
 .ppc64el-rules:
    rules:

.gitlab-ci/windows/mesa_build.ps1

@@ -9,7 +9,7 @@ Write-Host "Compiling Mesa"
 $builddir = New-Item -ItemType Directory -Name "_build"
 $installdir = New-Item -ItemType Directory -Name "_install"
 Push-Location $builddir.FullName
-cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false -Dc_std=c17 -Dcpp_std=vc++latest -Db_vscrt=mt --cmake-prefix-path=`"C:\llvm-10`" --pkg-config-path=`"C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig`" --prefix=`"$installdir`" -Dllvm=enabled -Dshared-llvm=disabled -Dvulkan-drivers=swrast,amd -Dgallium-drivers=swrast,d3d12,zink -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dbuild-tests=true -Dwerror=true -Dwarning_level=2 -Dzlib:warning_level=1 -Dlibelf:warning_level=1 && ninja -j32 install && meson test --num-processes 32"
+cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false -Dc_std=c17 -Dcpp_std=vc++latest -Db_vscrt=mt --cmake-prefix-path=`"C:\llvm-10`" --pkg-config-path=`"C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig`" --prefix=`"$installdir`" -Dllvm=enabled -Dshared-llvm=disabled -Dvulkan-drivers=swrast,amd -Dgallium-drivers=swrast,d3d12,zink -Dshared-glapi=enabled -Dgles2=enabled -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dspirv-to-dxil=true -Dbuild-tests=true -Dwerror=true -Dwarning_level=2 -Dzlib:warning_level=1 -Dlibelf:warning_level=1 && ninja -j32 install && meson test --num-processes 32"
 $buildstatus = $?
 Pop-Location
 

.gitlab-ci/windows/piglit_run.ps1

@@ -1,6 +1,8 @@
 $env:PIGLIT_NO_FAST_SKIP = 1
 
 Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\lib\piglit\bin\opengl32.dll
+Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\lib\piglit\bin\libgallium_wgl.dll
+Copy-Item -Path _install\bin\libglapi.dll -Destination C:\Piglit\lib\piglit\bin\libglapi.dll
 
 # Run this using VsDevCmd.bat to ensure DXIL.dll is in %PATH%
 cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && py -3 C:\Piglit\bin\piglit.py run `"$env:PIGLIT_PROFILE`" $env:PIGLIT_OPTIONS $env:PIGLIT_TESTS .\results"

.gitlab-ci/windows/quick_gl.txt

@@ -364,7 +364,6 @@ spec/!opengl 2.0/vertex-program-two-side/tcs-out, tes and fs: skip
 spec/!opengl 2.0/vertex-program-two-side/tes-out and fs: skip
 spec/!opengl 2.0/vertex-program-two-side/vs, gs and fs: skip
 spec/!opengl 2.0/vertex-program-two-side/vs, tcs, tes and fs: skip
-spec/!opengl 2.1/fbo-mrt-alphatest-no-buffer-zero-write: crash
 spec/!opengl 3.0/bound-resource-limits: fail
 spec/!opengl 3.0/clearbuffer-depth-cs-probe: skip
 spec/!opengl 3.0/required-sized-texture-formats: fail
@@ -2390,7 +2389,6 @@ spec/arb_texture_barrier/arb_texture_barrier-blending-in-shader 512 42 8 8 7: sk
 spec/arb_texture_barrier/arb_texture_barrier-blending-in-shader 512 42 8 8 8: skip
 spec/arb_texture_buffer_object/bufferstorage: skip
 spec/arb_texture_buffer_object/data-sync: fail
-spec/arb_texture_buffer_object/get: fail
 spec/arb_texture_buffer_object/indexed: skip
 spec/arb_texture_buffer_object/negative-unsupported: skip
 spec/arb_texture_buffer_object/subdata-sync: fail
@@ -4751,9 +4749,9 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    13301
-       fail:      536
-      crash:       68
+       pass:    13303
+       fail:      535
+      crash:       67
        skip:     4126
     timeout:        0
        warn:       10

CODEOWNERS

@@ -0,0 +1,138 @@
+# This file contains the GitLab handle of the maintainers/reviewers for
+# a given file:
+# https://docs.gitlab.com/ce/user/project/code_owners.html
+#
+# Consider these as the list of people who want to be involved in MRs
+# touching these files/folders, and whom you can ask your questions and
+# tag in issues.
+#
+# As of GitLab 14.3, all features surrounding this file are premium-only,
+# which means this file is only read by humans for now.
+#
+# Paths starting with a `/` are relative to the git root, otherwise they
+# can match any substring of the file's path.
+# If multiple lines match, only the last one applies; there is no
+# accumulation.
+
+
+##################
+# INFRASTRUCTURE #
+##################
+
+# Build system - Meson
+meson.build @dbaker @eric
+/meson_options.txt @dbaker @eric
+/docs/meson.rst @dbaker @eric
+
+# Build system - Android
+/android/ @roman.stratiienko
+
+# Compatibility headers
+/include/c99* @evelikov
+/include/c11* @eric
+
+# Documentation
+/docs/ @eric @evelikov
+
+
+##########
+# COMMON #
+##########
+
+# NIR
+/src/compiler/nir/ @jekstrand
+
+# Vulkan
+/src/vulkan/ @eric @jekstrand
+/include/vulkan/ @eric @jekstrand
+
+
+#############
+# PLATFORMS #
+#############
+
+# EGL
+/src/egl/ @eric @evelikov
+/include/EGL/ @eric @evelikov
+
+# EGL - Android support
+/src/egl/drivers/dri2/platform_android.c @robh @tfiga
+
+# EGL - Device support
+/src/egl/drivers/dri2/platform_device.c @evelikov
+
+# EGL - Wayland support
+/src/egl/wayland/ @daniels @eric
+/src/egl/drivers/dri2/platform_wayland.c @daniels @eric
+
+# Gallium targets
+/src/gallium/targets/ @evelikov
+
+# GLX
+/src/glx/ @ajax
+/include/GL/glx* @ajax
+
+# GLVND
+/src/egl/main/eglglvnd.c @kbrenneman
+/src/egl/main/egldispatchstubs.* @kbrenneman
+/src/egl/generate/ @kbrenneman
+/src/glx/*glvnd* @kbrenneman
+
+# Haiku
+/include/HaikuGL/ @kallisti5
+/src/egl/drivers/haiku/ @kallisti5
+/src/gallium/frontends/hgl/ @kallisti5
+/src/gallium/targets/haiku-softpipe/ @kallisti5
+/src/gallium/winsys/sw/hgl/ @kallisti5
+/src/hgl/ @kallisti5
+
+# Loader - DRI/classic
+/src/loader/ @evelikov
+
+# Loader - Gallium
+/src/gallium/auxiliary/pipe-loader/ @evelikov
+/src/gallium/auxiliary/target-helpers/ @evelikov
+
+# Vulkan WSI - Display
+/src/vulkan/wsi/wsi_common_display.* @keithp
+/src/*/vulkan/*_wsi_display.c @keithp
+
+
+###########
+# Drivers #
+###########
+
+# Asahi
+/src/asahi/ @alyssa
+/src/gallium/drivers/asahi/ @alyssa
+
+# Freedreno
+/src/gallium/drivers/freedreno/ @robclark
+
+# Intel
+/include/drm-uapi/i915_drm.h @kwg @llandwerlin @jekstrand @idr
+/include/pci_ids/i*_pci_ids.h @kwg @llandwerlin @jekstrand @idr
+/src/intel/ @kwg @llandwerlin @jekstrand @idr
+/src/gallium/winsys/iris/ @kwg @llandwerlin @jekstrand @idr
+/src/gallium/drivers/iris/ @kwg @llandwerlin @jekstrand @idr
+/src/gallium/drivers/i915/ @anholt
+/src/mesa/drivers/dri/i965/ @kwg @llandwerlin @jekstrand @idr
+/doxygen/i965.doxy @kwg @llandwerlin @jekstrand @idr
+
+# Microsoft
+/src/microsoft/ @jenatali
+/src/gallium/drivers/d3d12/ @jenatali
+
+# Panfrost
+/src/panfrost/ @alyssa
+/src/panfrost/vulkan/ @bbrezillon
+/src/gallium/drivers/panfrost/ @alyssa
+
+# SWR
+/src/gallium/drivers/swr/ @jzielins @krzysztof.raszkowski
+/docs/gallium/drivers/openswr.rst @jzielins @krzysztof.raszkowski
+/docs/gallium/drivers/openswr/ @jzielins @krzysztof.raszkowski
+
+# VMware
+/src/gallium/drivers/svga/ @brianp @charmainel
+/src/gallium/winsys/svga/ @thomash @drawat

REVIEWERS

@@ -1,114 +0,0 @@
-Overview:
-
-	This file is similar in syntax (or more precisly a subset) of what is
-	used by the MAINTAINERS file in the linux kernel.
-	The purpose is not exactly the same the MAINTAINERS file in the linux
-	kernel, as there are not official/formal maintainers of different
-	subsystems in mesa, but is meant to give an idea of who to CC for
-	various patches for review.
-
-Descriptions of section entries:
-
-	R: Designated reviewer: FullName <address@domain>
-	   These reviewers should be CCed on patches.
-	F: Files and directories with wildcard patterns.
-	   A trailing slash includes all files and subdirectory files.
-	   F:	drivers/net/	all files in and below drivers/net
-	   F:	drivers/net/*	all files in drivers/net, but not below
-	   F:	*/net/*		all files in "any top level directory"/net
-	   One pattern per line.  Multiple F: lines acceptable.
-
-Maintainers List (try to look for most precise areas first)
-
-Note: this is an opt-in system, I have not tried to add anyone who hasn't
-either asked me or sent a patch to add themselves.
-
-		-----------------------------------
-
-NIR
-R:	Jason Ekstrand <jason@jlekstrand.net>
-F:	src/compiler/nir/
-
-DOCUMENTATION
-R: Emil Velikov <emil.l.velikov@gmail.com>
-R: Eric Engestrom <eric@engestrom.ch>
-F: docs/
-
-COMPATIBILITY HEADERS
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: include/c99*
-
-DRI LOADER
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/loader/
-
-EGL
-R: Eric Engestrom <eric@engestrom.ch>
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/egl/
-F: include/EGL/
-
-HAIKU
-R: Alexander von Gluck IV <kallisti5@unixzen.com>
-F: include/HaikuGL/
-F: src/egl/drivers/haiku/
-F: src/gallium/frontends/hgl/
-F: src/gallium/targets/haiku-softpipe/
-F: src/gallium/winsys/sw/hgl/
-F: src/hgl/
-
-GALLIUM LOADER
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/gallium/auxiliary/pipe-loader/
-F: src/gallium/auxiliary/target-helpers/
-
-GALLIUM TARGETS
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/gallium/targets/
-
-ANDROID BUILD
-R: Emil Velikov <emil.l.velikov@gmail.com>
-R: Rob Herring <robh@kernel.org>
-F: CleanSpec.mk
-F: */Android.*mk
-F: */Makefile.sources
-
-MESON BUILD
-R: Dylan Baker <dylan@pnwbakers.com>
-R: Eric Engestrom <eric@engestrom.ch>
-F: */meson.build
-F: meson.build
-F: meson_options.txt
-
-ANDROID EGL SUPPORT
-R: Rob Herring <robh@kernel.org>
-R: Tomasz Figa <tfiga@chromium.org>
-F: src/egl/drivers/dri2/platform_android.c
-
-WAYLAND EGL SUPPORT
-R: Daniel Stone <daniels@collabora.com>
-F: src/egl/wayland/*
-F: src/egl/drivers/dri2/platform_wayland.c
-
-FREEDRENO
-R:	Rob Clark <robclark@freedesktop.org>
-F:	src/gallium/drivers/freedreno/
-
-GLX
-R: Adam Jackson <ajax@redhat.com>
-F: src/glx/
-
-VULKAN
-R: Eric Engestrom <eric@engestrom.ch>
-F: src/vulkan/
-F: include/vulkan/
-
-VMWARE DRIVER
-R: Brian Paul <brianp@vmware.com>
-R: Charmaine Lee <charmainel@vmware.com>
-F: src/gallium/drivers/svga/
-
-VMWARE WINSYS CODE
-R: Thomas Hellstrom <thellstrom@vmware.com>
-R: Deepak Rawat <drawat@vmware.com>
-F: src/gallium/winsys/svga/

VERSION

@@ -1 +1 @@
-21.2.6
+21.3.0-devel

android/Android.mk

@@ -32,6 +32,7 @@ MESA_VK_LIB_SUFFIX_amd := radeon
 MESA_VK_LIB_SUFFIX_intel := intel
 MESA_VK_LIB_SUFFIX_freedreno := freedreno
 MESA_VK_LIB_SUFFIX_broadcom := broadcom
+MESA_VK_LIB_SUFFIX_panfrost := panfrost
 MESA_VK_LIB_SUFFIX_virtio-experimental := virtio
 MESA_VK_LIB_SUFFIX_swrast := lvp
 
@@ -74,10 +75,10 @@ MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION)
 endif
 
 ifneq ($(MESON_GEN_LLVM_STUB),)
-MESON_LLVM_VERSION := 11.0.0
+MESON_LLVM_VERSION := 12.0.0
 # Required for swr gallium target
 MESON_LLVM_IRBUILDER_PATH := external/llvm-project/llvm/include/llvm/IR/IRBuilder.h
-LOCAL_SHARED_LIBRARIES += libLLVM11
+LOCAL_SHARED_LIBRARIES += libLLVM12
 endif
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30; echo $$?), 0)

android/mesa3d_cross.mk

@@ -128,6 +128,7 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_C_INCLUDES := $(my_c_includes)
 $(MESON_GEN_FILES_TARGET): PRIVATE_IMPORTED_INCLUDES := $(imported_includes)
 $(MESON_GEN_FILES_TARGET): PRIVATE_LDFLAGS := $(my_ldflags)
 $(MESON_GEN_FILES_TARGET): PRIVATE_LDLIBS := $(my_ldlibs)
+$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)
 $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_CHECKS := $(my_tidy_checks)
 $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_FLAGS := $(my_tidy_flags)
 $(MESON_GEN_FILES_TARGET): PRIVATE_ARFLAGS := $(my_arflags)
@@ -138,11 +139,6 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_ALL_OBJECTS := $(strip $(all_objects))
 
 $(MESON_GEN_FILES_TARGET): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
 
-$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags)
-$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CONLYFLAGS := $(my_target_global_conlyflags)
-$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
-$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)
-
 $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)
 $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)
 $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)

bin/install_megadrivers.py

@@ -22,7 +22,6 @@
 
 """Script to install megadriver symlinks for meson."""
 
-from __future__ import print_function
 import argparse
 import os
 

bin/khronos-update.py

@@ -47,7 +47,7 @@ SOURCES = [
         'api': 'khr',
         'inc_folder': 'KHR',
         'sources': [
-            Source('include/KHR/khrplatform.h',    'https://github.com/KhronosGroup/EGL-Registry/raw/master/api/KHR/khrplatform.h'),
+            Source('include/KHR/khrplatform.h',    'https://github.com/KhronosGroup/EGL-Registry/raw/main/api/KHR/khrplatform.h'),
         ],
     },
 
@@ -55,10 +55,10 @@ SOURCES = [
         'api': 'egl',
         'inc_folder': 'EGL',
         'sources': [
-            Source('src/egl/generate/egl.xml',     'https://github.com/KhronosGroup/EGL-Registry/raw/master/api/egl.xml'),
-            Source('include/EGL/egl.h',            'https://github.com/KhronosGroup/EGL-Registry/raw/master/api/EGL/egl.h'),
-            Source('include/EGL/eglplatform.h',    'https://github.com/KhronosGroup/EGL-Registry/raw/master/api/EGL/eglplatform.h'),
-            Source('include/EGL/eglext.h',         'https://github.com/KhronosGroup/EGL-Registry/raw/master/api/EGL/eglext.h'),
+            Source('src/egl/generate/egl.xml',     'https://github.com/KhronosGroup/EGL-Registry/raw/main/api/egl.xml'),
+            Source('include/EGL/egl.h',            'https://github.com/KhronosGroup/EGL-Registry/raw/main/api/EGL/egl.h'),
+            Source('include/EGL/eglplatform.h',    'https://github.com/KhronosGroup/EGL-Registry/raw/main/api/EGL/eglplatform.h'),
+            Source('include/EGL/eglext.h',         'https://github.com/KhronosGroup/EGL-Registry/raw/main/api/EGL/eglext.h'),
             Source('include/EGL/eglextchromium.h', 'https://chromium.googlesource.com/chromium/src/+/refs/heads/master/ui/gl/EGL/eglextchromium.h?format=TEXT'),
             Source('include/EGL/eglext_angle.h',   'https://chromium.googlesource.com/angle/angle/+/refs/heads/master/include/EGL/eglext_angle.h?format=TEXT'),
             Source('include/EGL/eglmesaext.h',     None),
@@ -69,11 +69,11 @@ SOURCES = [
         'api': 'gl',
         'inc_folder': 'GL',
         'sources': [
-            Source('src/mapi/glapi/registry/gl.xml', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/xml/gl.xml'),
-            Source('include/GL/glcorearb.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GL/glcorearb.h'),
-            Source('include/GL/glext.h',             'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GL/glext.h'),
-            Source('include/GL/glxext.h',            'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GL/glxext.h'),
-            Source('include/GL/wglext.h',            'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GL/wglext.h'),
+            Source('src/mapi/glapi/registry/gl.xml', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/xml/gl.xml'),
+            Source('include/GL/glcorearb.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glcorearb.h'),
+            Source('include/GL/glext.h',             'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glext.h'),
+            Source('include/GL/glxext.h',            'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glxext.h'),
+            Source('include/GL/wglext.h',            'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/wglext.h'),
             Source('include/GL/gl.h',                None),  # FIXME: I don't know what the canonical source is
             Source('include/GL/glx.h',               None),  # FIXME: I don't know what the canonical source is
             Source('include/GL/internal/',           None),
@@ -86,10 +86,10 @@ SOURCES = [
         'api': 'gles1',
         'inc_folder': 'GLES',
         'sources': [
-            Source('include/GLES/gl.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES/gl.h'),
-            Source('include/GLES/glplatform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES/glplatform.h'),
-            Source('include/GLES/glext.h',      'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES/glext.h'),
-            Source('include/GLES/egl.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES/egl.h'),
+            Source('include/GLES/gl.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES/gl.h'),
+            Source('include/GLES/glplatform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES/glplatform.h'),
+            Source('include/GLES/glext.h',      'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES/glext.h'),
+            Source('include/GLES/egl.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES/egl.h'),
         ],
     },
 
@@ -97,9 +97,9 @@ SOURCES = [
         'api': 'gles2',
         'inc_folder': 'GLES2',
         'sources': [
-            Source('include/GLES2/gl2.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES2/gl2.h'),
-            Source('include/GLES2/gl2platform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES2/gl2platform.h'),
-            Source('include/GLES2/gl2ext.h',      'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES2/gl2ext.h'),
+            Source('include/GLES2/gl2.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES2/gl2.h'),
+            Source('include/GLES2/gl2platform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES2/gl2platform.h'),
+            Source('include/GLES2/gl2ext.h',      'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES2/gl2ext.h'),
         ],
     },
 
@@ -107,10 +107,10 @@ SOURCES = [
         'api': 'gles3',
         'inc_folder': 'GLES3',
         'sources': [
-            Source('include/GLES3/gl3.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES3/gl3.h'),
-            Source('include/GLES3/gl31.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES3/gl31.h'),
-            Source('include/GLES3/gl32.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES3/gl32.h'),
-            Source('include/GLES3/gl3platform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/master/api/GLES3/gl3platform.h'),
+            Source('include/GLES3/gl3.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES3/gl3.h'),
+            Source('include/GLES3/gl31.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES3/gl31.h'),
+            Source('include/GLES3/gl32.h',        'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES3/gl32.h'),
+            Source('include/GLES3/gl3platform.h', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GLES3/gl3platform.h'),
             Source('include/GLES3/gl3ext.h',      None),  # FIXME: I don't know what the canonical source is
         ],
     },
@@ -155,25 +155,27 @@ SOURCES = [
         'api': 'vulkan',
         'inc_folder': 'vulkan',
         'sources': [
-            Source('src/vulkan/registry/vk.xml',                'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/registry/vk.xml'),
-            Source('include/vulkan/vulkan.h',                   'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan.h'),
-            Source('include/vulkan/vulkan_core.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_core.h'),
-            Source('include/vulkan/vulkan_beta.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_beta.h'),
-            Source('include/vulkan/vk_icd.h',                   'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vk_icd.h'),
-            Source('include/vulkan/vk_layer.h',                 'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vk_layer.h'),
-            Source('include/vulkan/vk_platform.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vk_platform.h'),
-            Source('include/vulkan/vulkan_android.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_android.h'),
-            Source('include/vulkan/vulkan_fuchsia.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_fuchsia.h'),
-            Source('include/vulkan/vulkan_ggp.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_ggp.h'),
-            Source('include/vulkan/vulkan_ios.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_ios.h'),
-            Source('include/vulkan/vulkan_macos.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_macos.h'),
-            Source('include/vulkan/vulkan_metal.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_metal.h'),
-            Source('include/vulkan/vulkan_vi.h',                'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_vi.h'),
-            Source('include/vulkan/vulkan_wayland.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_wayland.h'),
-            Source('include/vulkan/vulkan_win32.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_win32.h'),
-            Source('include/vulkan/vulkan_xcb.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_xcb.h'),
-            Source('include/vulkan/vulkan_xlib.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_xlib.h'),
-            Source('include/vulkan/vulkan_xlib_xrandr.h',       'https://github.com/KhronosGroup/Vulkan-Headers/raw/master/include/vulkan/vulkan_xlib_xrandr.h'),
+            Source('src/vulkan/registry/vk.xml',                'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/registry/vk.xml'),
+            Source('include/vulkan/vulkan.h',                   'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan.h'),
+            Source('include/vulkan/vulkan_core.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_core.h'),
+            Source('include/vulkan/vulkan_beta.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_beta.h'),
+            Source('include/vulkan/vk_icd.h',                   'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vk_icd.h'),
+            Source('include/vulkan/vk_layer.h',                 'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vk_layer.h'),
+            Source('include/vulkan/vk_platform.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vk_platform.h'),
+            Source('include/vulkan/vulkan_android.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_android.h'),
+            Source('include/vulkan/vulkan_directfb.h',          'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_directfb.h'),
+            Source('include/vulkan/vulkan_fuchsia.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_fuchsia.h'),
+            Source('include/vulkan/vulkan_ggp.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_ggp.h'),
+            Source('include/vulkan/vulkan_ios.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_ios.h'),
+            Source('include/vulkan/vulkan_macos.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_macos.h'),
+            Source('include/vulkan/vulkan_metal.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_metal.h'),
+            Source('include/vulkan/vulkan_screen.h',            'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_screen.h'),
+            Source('include/vulkan/vulkan_vi.h',                'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_vi.h'),
+            Source('include/vulkan/vulkan_wayland.h',           'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_wayland.h'),
+            Source('include/vulkan/vulkan_win32.h',             'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_win32.h'),
+            Source('include/vulkan/vulkan_xcb.h',               'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_xcb.h'),
+            Source('include/vulkan/vulkan_xlib.h',              'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_xlib.h'),
+            Source('include/vulkan/vulkan_xlib_xrandr.h',       'https://github.com/KhronosGroup/Vulkan-Headers/raw/main/include/vulkan/vulkan_xlib_xrandr.h'),
             Source('include/vulkan/vk_android_native_buffer.h', 'https://android.googlesource.com/platform/frameworks/native/+/master/vulkan/include/vulkan/vk_android_native_buffer.h?format=TEXT'),
             Source('include/vulkan/.editorconfig',              None),
         ],

bin/meson_get_version.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # encoding=utf-8
 # Copyright © 2017 Intel Corporation
 
@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import print_function
 import os
 
 

bin/symbols-check.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import os
@@ -21,6 +21,9 @@ PLATFORM_SYMBOLS = [
     '_end',
     '_fini',
     '_init',
+    '_fbss',
+    '_fdata',
+    '_ftext',
 ]
 
 def get_symbols_nm(nm, lib):
@@ -70,7 +73,7 @@ def get_symbols_dumpbin(dumpbin, lib):
             continue
         symbol_name = fields[3]
         # De-mangle symbols
-        if symbol_name[0] == '_':
+        if symbol_name[0] == '_' and '@' in symbol_name:
             symbol_name = symbol_name[1:].split('@')[0]
         symbols.append(symbol_name)
     return symbols

bin/update-android-headers.sh

@@ -8,9 +8,11 @@ if [ ! -e .git ]; then
 fi
 
 if [ ! -d platform-hardware-libhardware ]; then
+    git clone --depth 1 https://android.googlesource.com/platform/frameworks/native platform-frameworks-native
     git clone --depth 1 https://android.googlesource.com/platform/hardware/libhardware platform-hardware-libhardware
     git clone --depth 1 https://android.googlesource.com/platform/system/core platform-system-core
-    git clone --depth 1 https://android.googlesource.com/platform/frameworks/native platform-frameworks-native
+    git clone --depth 1 https://android.googlesource.com/platform/system/logging platform-system-logging
+    git clone --depth 1 https://android.googlesource.com/platform/system/unwinding platform-system-unwinding
 fi
 
 dest=include/android_stub
@@ -25,14 +27,14 @@ mkdir ${dest}
 
 # These directories contains mostly only the files we need, so copy wholesale
 
-cp -av platform-frameworks-native/libs/nativewindow/include/vndk        \
-    platform-system-core/libsync/include/sync                           \
-    platform-system-core/libsync/include/ndk                            \
-    platform-system-core/libbacktrace/include/backtrace                 \
-    platform-system-core/libsystem/include/system                       \
-    platform-system-core/liblog/include/log                             \
-    platform-frameworks-native/libs/nativewindow/include/apex           \
+cp -av                                                                  \
+    platform-frameworks-native/libs/nativewindow/include/vndk           \
     platform-frameworks-native/libs/nativebase/include/nativebase       \
+    platform-system-core/libsync/include/ndk                            \
+    platform-system-core/libsync/include/sync                           \
+    platform-system-core/libsystem/include/system                       \
+    platform-system-logging/liblog/include/log                          \
+    platform-system-unwinding/libbacktrace/include/backtrace            \
     ${dest}
 
 
@@ -43,15 +45,16 @@ cp -av platform-hardware-libhardware/include/hardware/{hardware,gralloc,gralloc1
 cp -av platform-frameworks-native/vulkan/include/hardware/hwvulkan.h ${dest}/hardware
 
 mkdir ${dest}/cutils
-cp -av platform-system-core/libcutils/include/cutils/{log,native_handle,properties}.h ${dest}/cutils
+cp -av platform-system-core/libcutils/include/cutils/{compiler,log,native_handle,properties,trace}.h ${dest}/cutils
 
 
 # include/android has files from a few different projects
 
 mkdir ${dest}/android
-cp -av platform-frameworks-native/libs/nativewindow/include/android/*   \
+cp -av                                                                  \
+    platform-frameworks-native/libs/nativewindow/include/android/*      \
     platform-frameworks-native/libs/arect/include/android/*             \
-    platform-system-core/liblog/include/android/*                       \
     platform-system-core/libsync/include/android/*                      \
+    platform-system-logging/liblog/include/android/*                    \
     ${dest}/android
 

docs/bugs.rst

@@ -1,12 +1,8 @@
 Report a Bug
 ============
 
-The Mesa bug database is hosted on
-`freedesktop.org <https://freedesktop.org>`__. The old bug database on
-SourceForge is no longer used.
-
 To file a Mesa bug, go to `GitLab on
-freedesktop.org <https://gitlab.freedesktop.org/mesa/mesa/-/issues>`__
+freedesktop.org <https://gitlab.freedesktop.org/mesa/mesa/-/issues>`__.
 
 Please follow these bug reporting guidelines:
 

docs/ci/index.rst

@@ -52,6 +52,41 @@ The three GitLab CI systems currently integrated are:
    LAVA
    docker
 
+Application traces replay
+-------------------------
+
+The CI replays application traces with various drivers in two different jobs. The first
+job replays traces listed in ``src/<driver>/ci/traces-<driver>.yml`` files and if any
+of those traces fail the pipeline fails as well. The second job replays traces listed in
+``src/<driver>/ci/restricted-traces-<driver>.yml`` and it is allowed to fail. This second
+job is only created when the pipeline is triggered by `marge-bot` or any other user that
+has been granted access to these traces.
+
+A traces YAML file also includes a ``download-url`` pointing to a MinIO
+instance where to download the traces from. While the first job should always work with
+publicly accessible traces, the second job could point to an url with restricted access.
+
+Restricted traces are those that have been made available to Mesa developers without a
+license to redistribute at will, and thus should not be exposed to the public. Failing to
+access that URL would not prevent the pipeline to pass, therefore forks made by
+contributors without permissions to download non-redistributable traces can be merged
+without friction.
+
+As an aside, only maintainers of such non-redistributable traces are responsible for
+ensuring that replays are successful, since other contributors would not be able to
+download and test them by themselves.
+
+Those Mesa contributors that believe they could have permission to access such
+non-redistributable traces can request permission to Daniel Stone <daniels@collabora.com>.
+
+gitlab.freedesktop.org accounts that are to be granted access to these traces will be
+added to the OPA policy for the MinIO repository as per
+https://gitlab.freedesktop.org/freedesktop/helm-gitlab-config/-/commit/a3cd632743019f68ac8a829267deb262d9670958 .
+
+So the jobs are created in personal repositories, the name of the user's account needs
+to be added to the rules attribute of the Gitlab CI job that accesses the restricted
+accounts.
+
 Intel CI
 --------
 

docs/ci/uri-caching.conf

@@ -1,4 +1,4 @@
-set $authorization '';
+set $proxy_authorization '';
 
 set_by_lua $proxyuri '
         unescaped =  ngx.unescape_uri(ngx.var.arg_uri);
@@ -13,10 +13,12 @@ set_by_lua $proxyuri '
         host = it[3];
         query = it[4];
 
-        if authstring then
+        if ngx.var.http_authorization and ngx.var.http_authorization ~= "" then
+                ngx.var.proxy_authorization = ngx.var.http_authorization;
+        elseif authstring then
                 auth = string.sub(authstring, 0, -2);
                 auth64 = ngx.encode_base64(auth);
-                ngx.var.authorization = "Basic " .. auth64;
+                ngx.var.proxy_authorization = "Basic " .. auth64;
         end
 
         -- Default to / if none is set to avoid using the request_uri query
@@ -28,7 +30,7 @@ set_by_lua $proxyuri '
 ';
 
 add_header X-GG-Cache-Status $upstream_cache_status;
-proxy_set_header Authorization $authorization;
+proxy_set_header Authorization $proxy_authorization;
 
 proxy_pass $proxyuri;
 # Redirect back to ourselves on 301 replies

docs/drivers/freedreno/isaspec.rst

@@ -22,7 +22,7 @@ cuts taken to get things up and running (which are mostly not inherent to
 the xml schema, and should not be too difficult to remove from the py and
 decode/disasm utility):
 
-* Maximum "bitset" size is 64b
+* Maximum "field" size is 64b
 * Fixed instruction size
 
 Often times, especially when new functionality is added in later gens
@@ -184,6 +184,9 @@ decoding.  The display template consists of references to fields (which may
 be derived fields) specified as ``{FIELDNAME}`` and other characters
 which are just echoed through to the resulting decoded bitset.
 
+It is possible to define a line column alignment value per field to influence
+the visual output. It needs to be pecified as ``{FIELDNAME:align=xx}``.
+
 The ``<override>`` element will be described in the next section, but it
 provides for both different decoded instruction syntax/mnemonics (when
 simply providing a different display template string) as well as instruction

docs/drivers/llvmpipe.rst

@@ -106,9 +106,10 @@ Windows
 
 On Windows, building will create
 ``build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll`` which
-is a drop-in alternative for system's ``opengl32.dll``. To use it put it
-in the same directory as your application. It can also be used by
-replacing the native ICD driver, but it's quite an advanced usage, so if
+is a drop-in alternative for system's ``opengl32.dll``, which will use
+the Mesa ICD, ``build/windows-x86-debug/gallium/targets/wgl/libgallium_wgl.dll``.
+To use it put both dlls in the same directory as your application. It can also
+be used by replacing the native ICD driver, but it's quite an advanced usage, so if
 you need to ask, don't even try it.
 
 There is however an easy way to replace the OpenGL software renderer
@@ -116,7 +117,7 @@ that comes with Microsoft Windows 7 (or later) with llvmpipe (that is,
 on systems without any OpenGL drivers):
 
 -  copy
-   ``build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll`` to
+   ``build/windows-x86-debug/gallium/targets/wgl/libgallium_wgl.dll`` to
    ``C:\Windows\SysWOW64\mesadrv.dll``
 
 -  load this registry settings:

docs/drivers/panfrost.rst

@@ -1,9 +1,10 @@
 Panfrost
 ========
 
-The Panfrost driver stack includes a **non-conformant** OpenGL ES
-implementation for Arm Mali GPUs based on the Midgard and Bifrost
-microarchitectures. The following GPUs are currently supported:
+The Panfrost driver stack includes an OpenGL ES implementation for Arm Mali
+GPUs based on the Midgard and Bifrost microarchitectures. It is **conformant**
+on Mali G52 but **non-conformant** on other GPUs. The following hardware is
+currently supported:
 
 =========  ============ ============ =======
 Product    Architecture OpenGL ES    OpenGL
@@ -39,17 +40,16 @@ it's easy to add support, see the commit ``cff7de4bb597e9`` as an example.
 LLVM is *not* required by Panfrost's compilers. LLVM support in Mesa can
 safely be disabled for most OpenGL ES users with Panfrost.
 
-Build with meson like ``meson . build/ -Ddri-drivers= -Dvulkan-drivers=
--Dgallium-drivers=panfrost -Dllvm=false`` for a build directory
+Build like ``meson . build/ -Ddri-drivers= -Dvulkan-drivers=
+-Dgallium-drivers=panfrost -Dllvm=disabled`` for a build directory
 ``build``.
 
-Building for Android via the legacy ``Android.mk`` system is not officially
-supported but reportedly works. Your mileage may vary.
-
 For general information on building Mesa, read :doc:`the install documentation
 <../install>`.
 
 Chat
 ----
 
-Panfrost developers and users hang out on IRC at ``#panfrost`` on OFTC.
+Panfrost developers and users hang out on IRC at ``#panfrost`` on OFTC. Note
+that registering and authenticating with `NickServ` is required to prevent
+spam. `Join the chat. <https://webchat.oftc.net/?channels=#panfrost>`_

docs/drivers/zink.rst

@@ -227,6 +227,23 @@ are required to be supported
 
   * `VK_KHR_draw_indirect_count`_
 
+Performance
+-----------
+
+If you notice poor performance and high CPU usage while running an application,
+changing the descriptor manager may improve performance:
+
+.. envvar:: ZINK_DESCRIPTORS <mode> ("auto")
+
+``auto``
+   Automatically detect best mode. This is the default.
+``lazy``
+   Disable caching and attempt to use the least amount of CPU.
+``nofallback``
+   Always use caching to try reducing GPU churn.
+``notemplates``
+   The same as `auto`, but disables the use of `VK_KHR_descriptor_templates`.
+
 Debugging
 ---------
 

docs/envvars.rst

@@ -232,12 +232,13 @@ the :doc:`Xlib software driver page <xlibdriver>` for details.
 :envvar:`MESA_GLX_ALPHA_BITS`
    specifies default number of bits for alpha channel.
 
-i945/i965 driver environment variables (non-Gallium)
+Intel driver environment variables
 ----------------------------------------------------
 
-:envvar:`INTEL_NO_HW`
-   if set to 1, prevents batches from being submitted to the hardware.
-   This is useful for debugging hangs, etc.
+:envvar:`INTEL_BLACKHOLE_DEFAULT`
+   if set to 1, true or yes, then the OpenGL implementation will
+   default ``GL_BLACKHOLE_RENDER_INTEL`` to true, thus disabling any
+   rendering.
 :envvar:`INTEL_DEBUG`
    a comma-separated list of named flags, which do various things:
 
@@ -334,8 +335,65 @@ i945/i965 driver environment variables (non-Gallium)
    ``vs``
       dump shader assembly for vertex shaders
 
-:envvar:`INTEL_SCALAR_VS` (or ``TCS``, ``TES``, ``GS``)
-   force scalar/vec4 mode for a shader stage (Gen8-9 only)
+:envvar:`INTEL_MEASURE`
+   Collects GPU timestamps over common intervals, and generates a CSV report
+   to show how long rendering took.  The overhead of collection is limited to
+   the flushing that is required at the interval boundaries for accurate
+   timestamps. By default, timing data is sent to ``stderr``.  To direct output
+   to a file:
+
+   ``INTEL_MEASURE=file=/tmp/measure.csv {workload}``
+
+   To begin capturing timestamps at a particular frame:
+
+   ``INTEL_MEASURE=file=/tmp/measure.csv,start=15 {workload}``
+
+   To capture only 23 frames:
+
+   ``INTEL_MEASURE=count=23 {workload}``
+
+   To capture frames 15-37, stopping before frame 38:
+
+   ``INTEL_MEASURE=start=15,count=23 {workload}``
+
+   Designate an asynchronous control file with:
+
+   ``INTEL_MEASURE=control=path/to/control.fifo {workload}``
+
+   As the workload runs, enable capture for 5 frames with:
+
+   ``$ echo 5 > path/to/control.fifo``
+
+   Enable unbounded capture:
+
+   ``$ echo -1 > path/to/control.fifo``
+
+   and disable with:
+
+   ``$ echo 0 > path/to/control.fifo``
+
+   Select the boundaries of each snapshot with:
+
+   ``INTEL_MEASURE=draw``
+      Collects timings for every render (DEFAULT)
+
+   ``INTEL_MEASURE=rt``
+      Collects timings when the render target changes
+
+   ``INTEL_MEASURE=batch``
+      Collects timings when batches are submitted
+
+   ``INTEL_MEASURE=frame``
+      Collects timings at frame boundaries
+
+   With ``INTEL_MEASURE=interval=5``, the duration of 5 events will be
+   combined into a single record in the output.  When possible, a single
+   start and end event will be submitted to the GPU to minimize
+   stalling.  Combined events will not span batches, except in
+   the case of ``INTEL_MEASURE=frame``.
+:envvar:`INTEL_NO_HW`
+   if set to 1, true or yes, prevents batches from being submitted to the
+   hardware. This is useful for debugging hangs, etc.
 :envvar:`INTEL_PRECISE_TRIG`
    if set to 1, true or yes, then the driver prefers accuracy over
    performance in trig functions.
@@ -353,10 +411,6 @@ i945/i965 driver environment variables (non-Gallium)
    The success of assembly override would be signified by "Successfully
    overrode shader with sha1 <sha1>" in stderr replacing the original
    assembly.
-:envvar:`INTEL_BLACKHOLE_DEFAULT`
-   if set to 1, true or yes, then the OpenGL implementation will
-   default ``GL_BLACKHOLE_RENDER_INTEL`` to true, thus disabling any
-   rendering.
 
 
 Radeon driver environment variables (radeon, r200, and r300g)
@@ -365,6 +419,13 @@ Radeon driver environment variables (radeon, r200, and r300g)
 :envvar:`RADEON_NO_TCL`
    if set, disable hardware-accelerated Transform/Clip/Lighting.
 
+DRI environment variables
+-------------------------
+
+:envvar:`DRI_NO_MSAA`
+   disable MSAA for GLX/EGL MSAA visuals
+
+
 EGL environment variables
 -------------------------
 
@@ -557,8 +618,6 @@ RADV driver environment variables
       force all allocated buffers to be referenced in submissions
    ``checkir``
       validate the LLVM IR before LLVM compiles the shader
-   ``errors``
-      display more info about errors
    ``forcecompress``
       Enables DCC,FMASK,CMASK,HTILE in situations where the driver supports it
       but normally does not deem it beneficial.
@@ -574,6 +633,8 @@ RADV driver environment variables
       class of application bugs appearing as flickering.
    ``metashaders``
       dump internal meta shaders
+   ``noatocdithering``
+      disable dithering for alpha to coverage
    ``nobinning``
       disable primitive binning
    ``nocache``
@@ -596,6 +657,8 @@ RADV driver environment variables
       disable memory shaders cache
    ``nongg``
       disable NGG for GFX10+
+   ``nonggc``
+      disable NGG culling on GPUs where it's enabled by default (GFX10.3+ only).
    ``nooutoforder``
       disable out-of-order rasterization
    ``notccompatcmask``
@@ -607,6 +670,8 @@ RADV driver environment variables
       disable VRS for flat shading (only on GFX10.3+)
    ``preoptir``
       dump LLVM IR before any optimizations
+   ``prologs``
+      dump vertex shader prologs
    ``shaders``
       dump shaders
    ``shaderstats``
@@ -639,6 +704,9 @@ RADV driver environment variables
       enable wave32 for compute shaders (GFX10+)
    ``dccmsaa``
       enable DCC for MSAA images
+   ``force_emulate_rt``
+      forces ray-tracing to be emulated in software,
+      even if there is hardware support.
    ``gewave32``
       enable wave32 for vertex/tess/geometry shaders (GFX10+)
    ``localbos``
@@ -648,7 +716,7 @@ RADV driver environment variables
    ``pswave32``
       enable wave32 for pixel shaders (GFX10+)
    ``nggc``
-      enable NGG culling on GFX10+ GPUs.
+      enable NGG culling on GPUs where it's not enabled by default (GFX10.1 only).
    ``rt``
       enable rt extensions whose implementation is still experimental.
    ``sam``
@@ -690,8 +758,6 @@ radeonsi driver environment variables
       Disable DCC.
    ``nodccclear``
       Disable DCC fast clear.
-   ``nodccfb``
-      Disable separate DCC on the main framebuffer
    ``nodccmsaa``
       Disable DCC for MSAA
    ``nodpbb``
@@ -768,12 +834,6 @@ radeonsi driver environment variables
       Always use NGG culling even when it can hurt.
    ``nonggc``
       Disable NGG culling.
-   ``alwayspd``
-      Always enable the primitive discard compute shader.
-   ``pd``
-      Enable the primitive discard compute shader for large draw calls.
-   ``nopd``
-      Disable the primitive discard compute shader.
    ``switch_on_eop``
       Program WD/IA to switch on end-of-packet.
    ``nooutoforder``

docs/features.txt

@@ -41,7 +41,7 @@ GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
   glBindFragDataLocation, glGetFragDataLocation         DONE
   GL_NV_conditional_render (Conditional rendering)      DONE ()
   GL_ARB_map_buffer_range (Map buffer subranges)        DONE (v3d, vc4, lima)
-  GL_ARB_color_buffer_float (Clamping controls)         DONE (v3d)
+  GL_ARB_color_buffer_float (Clamping controls)         DONE (v3d, lima)
   GL_ARB_texture_float (Float textures, renderbuffers)  DONE (v3d)
   GL_EXT_packed_float                                   DONE (v3d)
   GL_EXT_texture_shared_exponent                        DONE (v3d)
@@ -74,7 +74,7 @@ GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
   Forward compatible context support/deprecations       DONE
   GL_ARB_draw_instanced (Instanced drawing)             DONE (v3d)
   GL_ARB_copy_buffer (Buffer copying)                   DONE (v3d, vc4, lima)
-  GL_NV_primitive_restart (Primitive restart)           DONE ()
+  GL_NV_primitive_restart (Primitive restart)           DONE (v3d)
   16 vertex texture image units                         DONE ()
   GL_ARB_texture_buffer_object (Texture buffer objs)    DONE ()
   GL_ARB_texture_rectangle (Rectangular textures)       DONE (v3d, vc4, lima)
@@ -206,14 +206,14 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, nvc0, r600, radeonsi, llvmpipe, zink
   - input/output block locations                        DONE
   GL_ARB_multi_bind                                     DONE (all drivers)
   GL_ARB_query_buffer_object                            DONE (i965/hsw+, virgl)
-  GL_ARB_texture_mirror_clamp_to_edge                   DONE (i965, nv50, softpipe, swr, virgl, panfrost)
+  GL_ARB_texture_mirror_clamp_to_edge                   DONE (i965, nv50, softpipe, swr, virgl, v3d, panfrost)
   GL_ARB_texture_stencil8                               DONE (freedreno, i965/hsw+, nv50, softpipe, swr, virgl, v3d, panfrost, d3d12)
   GL_ARB_vertex_type_10f_11f_11f_rev                    DONE (freedreno, i965, nv50, softpipe, swr, virgl, panfrost, d3d12)
 
 GL 4.5, GLSL 4.50 -- all DONE: nvc0, r600, radeonsi, llvmpipe, zink
 
   GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+, softpipe, virgl)
-  GL_ARB_clip_control                                   DONE (freedreno, i965, nv50, softpipe, swr, virgl)
+  GL_ARB_clip_control                                   DONE (freedreno, i965, nv50, softpipe, swr, virgl, lima)
   GL_ARB_conditional_render_inverted                    DONE (freedreno, i965, nv50, softpipe, swr, virgl, panfrost)
   GL_ARB_cull_distance                                  DONE (freedreno/a6xx, i965, nv50, softpipe, swr, virgl)
   GL_ARB_derivative_control                             DONE (i965, nv50, softpipe, virgl)
@@ -235,12 +235,10 @@ GL 4.6, GLSL 4.60 -- all DONE: radeonsi, zink
   GL_ARB_shader_draw_parameters                         DONE (i965, llvmpipe, nvc0)
   GL_ARB_shader_group_vote                              DONE (i965, nvc0, llvmpipe)
   GL_ARB_spirv_extensions                               DONE (i965/gen7+, llvmpipe)
-  GL_ARB_texture_filter_anisotropic                     DONE (etnaviv/HALTI0, freedreno, i965, nv50, nvc0, r600, softpipe (*), llvmpipe (*), d3d12, virgl)
+  GL_ARB_texture_filter_anisotropic                     DONE (etnaviv/HALTI0, freedreno, i965, nv50, nvc0, r600, softpipe, llvmpipe, d3d12, virgl)
   GL_ARB_transform_feedback_overflow_query              DONE (i965/gen6+, nvc0, llvmpipe, softpipe, virgl)
   GL_KHR_no_error                                       DONE (all drivers)
 
-(*) softpipe and llvmpipe advertise 16x anisotropy but simply ignore the setting
-
 These are the extensions cherry-picked to make GLES 3.1
 GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, r600, radeonsi, virgl, v3d, softpipe, llvmpipe, zink, panfrost
 
@@ -270,45 +268,45 @@ GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, r600, radeonsi, virgl, v3d, s
       glGetBooleani_v - restrict to GLES enums
       gl_HelperInvocation support                       DONE (i965, r600, panfrost)
 
-GLES3.2, GLSL ES 3.2 -- all DONE: i965/gen9+, radeonsi, virgl, llvmpipe
+GLES3.2, GLSL ES 3.2 -- all DONE: i965/gen9+, radeonsi, virgl, llvmpipe, zink
 
   GL_EXT_color_buffer_float                             DONE (all drivers)
   GL_KHR_blend_equation_advanced                        DONE (freedreno/a6xx, i965, nvc0, panfrost)
   GL_KHR_debug                                          DONE (all drivers)
-  GL_KHR_robustness                                     DONE (freedreno, i965, nvc0, r600, zink)
-  GL_KHR_texture_compression_astc_ldr                   DONE (freedreno, i965/gen9+, r600, v3d, vc4, panfrost, softpipe, swr, zink, lima)
+  GL_KHR_robustness                                     DONE (freedreno, i965, nvc0, r600)
+  GL_KHR_texture_compression_astc_ldr                   DONE (freedreno, i965/gen9+, r600, v3d, vc4, panfrost, softpipe, swr, lima)
   GL_OES_copy_image                                     DONE (all drivers)
   GL_OES_draw_buffers_indexed                           DONE (all drivers that support GL_ARB_draw_buffers_blend)
   GL_OES_draw_elements_base_vertex                      DONE (all drivers)
-  GL_OES_geometry_shader                                DONE (freedreno/a6xx, i965/hsw+, nvc0, r600, softpipe, v3d, zink)
+  GL_OES_geometry_shader                                DONE (freedreno/a6xx, i965/hsw+, nvc0, r600, softpipe, v3d)
   GL_OES_gpu_shader5                                    DONE (freedreno/a6xx, all drivers that support GL_ARB_gpu_shader5)
-  GL_OES_primitive_bounding_box                         DONE (freedreno/a5xx+, i965/gen7+, nvc0, r600, softpipe, v3d, zink)
-  GL_OES_sample_shading                                 DONE (freedreno/a6xx, i965, nvc0, r600, zink, panfrost, zink)
-  GL_OES_sample_variables                               DONE (freedreno/a6xx, i965, nvc0, r600, zink, panfrost/bifrost, zink)
+  GL_OES_primitive_bounding_box                         DONE (freedreno/a5xx+, i965/gen7+, nvc0, r600, softpipe, v3d)
+  GL_OES_sample_shading                                 DONE (freedreno/a6xx, i965, nvc0, r600, panfrost)
+  GL_OES_sample_variables                               DONE (freedreno/a6xx, i965, nvc0, r600, panfrost/bifrost)
   GL_OES_shader_image_atomic                            DONE (all drivers that support GL_ARB_shader_image_load_store)
   GL_OES_shader_io_blocks                               DONE (All drivers that support GLES 3.1)
-  GL_OES_shader_multisample_interpolation               DONE (freedreno/a6xx, i965, nvc0, r600, zink)
+  GL_OES_shader_multisample_interpolation               DONE (freedreno/a6xx, i965, nvc0, r600)
   GL_OES_tessellation_shader                            DONE (freedreno/a6xx, all drivers that support GL_ARB_tessellation_shader)
   GL_OES_texture_border_clamp                           DONE (all drivers)
-  GL_OES_texture_buffer                                 DONE (freedreno, i965, nvc0, r600, softpipe, panfrost, zink)
-  GL_OES_texture_cube_map_array                         DONE (freedreno/a4xx+, i965/hsw+, nvc0, r600, softpipe, zink)
+  GL_OES_texture_buffer                                 DONE (freedreno, i965, nvc0, r600, softpipe, panfrost)
+  GL_OES_texture_cube_map_array                         DONE (freedreno/a4xx+, i965/hsw+, nvc0, r600, softpipe)
   GL_OES_texture_stencil8                               DONE (all drivers that support GL_ARB_texture_stencil8)
   GL_OES_texture_storage_multisample_2d_array           DONE (all drivers that support GL_ARB_texture_multisample)
 
 Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES version:
 
-  GL_ARB_bindless_texture                               DONE (nvc0, radeonsi)
+  GL_ARB_bindless_texture                               DONE (nvc0, radeonsi, zink)
   GL_ARB_cl_event                                       not started
   GL_ARB_compute_variable_group_size                    DONE (i965/gen7+, nvc0, radeonsi, zink)
   GL_ARB_ES3_2_compatibility                            DONE (i965/gen8+, radeonsi, virgl, zink)
   GL_ARB_fragment_shader_interlock                      DONE (i965, zink)
   GL_ARB_gpu_shader_int64                               DONE (i965/gen8+, nvc0, radeonsi, softpipe, llvmpipe, zink)
-  GL_ARB_parallel_shader_compile                        DONE (all drivers)
+  GL_ARB_parallel_shader_compile                        DONE (freedreno, iris, radeonsi)
   GL_ARB_post_depth_coverage                            DONE (i965, nvc0, radeonsi, llvmpipe, zink)
   GL_ARB_robustness_isolation                           not started
   GL_ARB_sample_locations                               DONE (nvc0, zink)
   GL_ARB_seamless_cubemap_per_texture                   DONE (etnaviv/SEAMLESS_CUBE_MAP, freedreno, i965, nvc0, r600, radeonsi, softpipe, swr, virgl)
-  GL_ARB_shader_ballot                                  DONE (i965/gen8+, nvc0, radeonsi)
+  GL_ARB_shader_ballot                                  DONE (i965/gen8+, nvc0, radeonsi, zink)
   GL_ARB_shader_clock                                   DONE (i965/gen7+, nv50, nvc0, r600, radeonsi, virgl, zink)
   GL_ARB_shader_stencil_export                          DONE (i965/gen9+, r600, radeonsi, softpipe, llvmpipe, swr, virgl, panfrost, zink)
   GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, nvc0, radeonsi, zink)
@@ -318,12 +316,12 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
   GL_ARB_sparse_texture2                                not started
   GL_ARB_sparse_texture_clamp                           not started
   GL_ARB_texture_filter_minmax                          DONE (nvc0/gm200+, zink)
-  GL_EXT_color_buffer_half_float                        DONE (gallium drivers supporting required formats)
+  GL_EXT_color_buffer_half_float                        DONE (freedreno, i965, iris, llvmpipe, nv50, nvc0, radeonsi, zink)
   GL_EXT_depth_bounds_test                              DONE (i965/gen12+, nv50, nvc0, radeonsi, softpipe, swr, zink)
-  GL_EXT_memory_object                                  DONE (radeonsi, i965/gen7+)
-  GL_EXT_memory_object_fd                               DONE (radeonsi, i965/gen7+)
+  GL_EXT_memory_object                                  DONE (radeonsi, i965/gen7+, llvmpipe)
+  GL_EXT_memory_object_fd                               DONE (radeonsi, i965/gen7+, llvmpipe)
   GL_EXT_memory_object_win32                            not started
-  GL_EXT_multisampled_render_to_texture                 DONE (freedreno/a6xx, panfrost)
+  GL_EXT_multisampled_render_to_texture                 DONE (freedreno/a6xx, panfrost, zink)
   GL_EXT_render_snorm                                   DONE (i965, r600, radeonsi, softpipe, zink)
   GL_EXT_semaphore                                      DONE (radeonsi, i965/gen7+)
   GL_EXT_semaphore_fd                                   DONE (radeonsi, i965/gen7+)
@@ -438,7 +436,7 @@ Vulkan 1.1 -- all DONE: anv, lvp, radv, tu, vn
   VK_KHR_maintenance1                                   DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_maintenance2                                   DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_maintenance3                                   DONE (anv, lvp, radv, tu, v3dv, vn)
-  VK_KHR_multiview                                      DONE (anv, lvp, radv, tu, vn)
+  VK_KHR_multiview                                      DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_relaxed_block_layout                           DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_sampler_ycbcr_conversion                       DONE (anv, radv, tu, vn)
   VK_KHR_shader_draw_parameters                         DONE (anv, lvp, radv, tu, vn)
@@ -450,20 +448,20 @@ Vulkan 1.2 -- all DONE: anv, vn
   VK_KHR_8bit_storage                                   DONE (anv/gen8+, lvp, radv, vn)
   VK_KHR_buffer_device_address                          DONE (anv/gen8+, lvp, radv, vn)
   VK_KHR_create_renderpass2                             DONE (anv, lvp, radv, tu, vn)
-  VK_KHR_depth_stencil_resolve                          DONE (anv, radv, tu, vn)
+  VK_KHR_depth_stencil_resolve                          DONE (anv, lvp, radv, tu, vn)
   VK_KHR_draw_indirect_count                            DONE (anv, lvp, radv, tu, vn)
   VK_KHR_driver_properties                              DONE (anv, lvp, radv, vn)
   VK_KHR_image_format_list                              DONE (anv, lvp, radv, tu, v3dv, vn)
-  VK_KHR_imageless_framebuffer                          DONE (anv, lvp, radv, vn)
+  VK_KHR_imageless_framebuffer                          DONE (anv, lvp, radv, tu, vn)
   VK_KHR_sampler_mirror_clamp_to_edge                   DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_separate_depth_stencil_layouts                 DONE (anv, lvp, radv, vn)
   VK_KHR_shader_atomic_int64                            DONE (anv/gen9+, lvp, radv, vn)
-  VK_KHR_shader_float16_int8                            DONE (anv/gen8+, radv, tu, vn)
-  VK_KHR_shader_float_controls                          DONE (anv/gen8+, radv, tu, vn)
-  VK_KHR_shader_subgroup_extended_types                 DONE (anv/gen8+, radv, vn)
-  VK_KHR_spirv_1_4                                      DONE (anv, radv, tu, vn)
-  VK_KHR_timeline_semaphore                             DONE (anv, radv, tu, vn)
-  VK_KHR_uniform_buffer_standard_layout                 DONE (anv, lvp, radv, v3dv, vn)
+  VK_KHR_shader_float16_int8                            DONE (anv/gen8+, lvp, radv, tu, vn)
+  VK_KHR_shader_float_controls                          DONE (anv/gen8+, lvp, radv, tu, vn)
+  VK_KHR_shader_subgroup_extended_types                 DONE (anv/gen8+, lvp, radv, tu, vn)
+  VK_KHR_spirv_1_4                                      DONE (anv, lvp, radv, tu, vn)
+  VK_KHR_timeline_semaphore                             DONE (anv, lvp, radv, tu, vn)
+  VK_KHR_uniform_buffer_standard_layout                 DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_vulkan_memory_model                            DONE (anv, radv, tu, vn)
   VK_EXT_descriptor_indexing                            DONE (anv/gen9+, radv, tu, vn)
   VK_EXT_host_query_reset                               DONE (anv, lvp, radv, tu, vn)
@@ -479,28 +477,29 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_deferred_host_operations                       DONE (anv, radv)
   VK_KHR_display                                        DONE (anv, lvp, radv, tu, v3dv)
   VK_KHR_display_swapchain                              not started
-  VK_KHR_external_fence_fd                              DONE (anv, radv, tu, v3dv)
+  VK_KHR_external_fence_fd                              DONE (anv, radv, tu, v3dv, vn)
   VK_KHR_external_fence_win32                           not started
-  VK_KHR_external_memory_fd                             DONE (anv, radv, tu, v3dv)
+  VK_KHR_external_memory_fd                             DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_external_memory_win32                          not started
-  VK_KHR_external_semaphore_fd                          DONE (anv, radv, tu, v3dv)
+  VK_KHR_external_semaphore_fd                          DONE (anv, radv, tu, v3dv, vn)
   VK_KHR_external_semaphore_win32                       not started
   VK_KHR_fragment_shading_rate                          not started
   VK_KHR_get_display_properties2                        DONE (anv, lvp, radv, tu, v3dv)
   VK_KHR_get_surface_capabilities2                      DONE (anv, lvp, radv, tu, v3dv, vn)
-  VK_KHR_incremental_present                            DONE (anv, lvp, radv, tu, v3dv)
+  VK_KHR_incremental_present                            DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_performance_query                              DONE (anv/gen8+, tu)
   VK_KHR_pipeline_executable_properties                 DONE (anv, radv, tu)
   VK_KHR_push_descriptor                                DONE (anv, lvp, radv, tu)
   VK_KHR_shader_clock                                   DONE (anv, radv)
+  VK_KHR_shader_integer_dot_product                     DONE (radv)
   VK_KHR_shader_non_semantic_info                       DONE (anv, radv)
   VK_KHR_shader_subgroup_uniform_control_flow           DONE (anv, radv)
   VK_KHR_shader_terminate_invocation                    DONE (anv, radv, tu)
   VK_KHR_shared_presentable_image                       not started
   VK_KHR_surface                                        DONE (anv, lvp, radv, tu, v3dv, vn)
-  VK_KHR_surface_protected_capabilities                 DONE (anv, lvp, radv, vn)
-  VK_KHR_swapchain                                      DONE (anv, lvp, radv, tu, v3dv)
-  VK_KHR_swapchain_mutable_format                       DONE (anv, radv)
+  VK_KHR_surface_protected_capabilities                 DONE (anv, lvp, radv, v3dv, vn)
+  VK_KHR_swapchain                                      DONE (anv, lvp, radv, tu, v3dv, vn)
+  VK_KHR_swapchain_mutable_format                       DONE (anv, radv, vn)
   VK_KHR_wayland_surface                                DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_workgroup_memory_explicit_layout               DONE (anv, radv)
   VK_KHR_win32_keyed_mutex                              not started
@@ -508,43 +507,44 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_xcb_surface                                    DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_xlib_surface                                   DONE (anv, lvp, radv, tu, v3dv, vn)
   VK_KHR_zero_initialize_workgroup_memory               DONE (anv, radv)
-  VK_EXT_4444_formats                                   DONE (anv, radv, tu)
+  VK_EXT_4444_formats                                   DONE (anv, lvp, radv, tu)
   VK_EXT_calibrated_timestamps                          DONE (anv, lvp, radv)
-  VK_EXT_color_write_enable                             DONE (anv)
+  VK_EXT_color_write_enable                             DONE (anv, lvp, v3dv)
   VK_EXT_conditional_rendering                          DONE (anv, lvp, radv, tu)
   VK_EXT_conservative_rasterization                     DONE (anv/gen9+, radv)
-  VK_EXT_custom_border_color                            DONE (anv, lvp, radv, tu)
+  VK_EXT_custom_border_color                            DONE (anv, lvp, radv, tu, v3dv)
   VK_EXT_debug_marker                                   DONE (radv)
-  VK_EXT_depth_clip_enable                              DONE (anv, radv, tu)
+  VK_EXT_depth_clip_enable                              DONE (anv, lvp, radv, tu)
   VK_EXT_depth_range_unrestricted                       DONE (radv)
   VK_EXT_discard_rectangles                             DONE (radv)
   VK_EXT_display_control                                DONE (anv, radv, tu)
   VK_EXT_extended_dynamic_state                         DONE (anv, lvp, radv, tu)
   VK_EXT_extended_dynamic_state2                        DONE (anv, lvp, radv)
-  VK_EXT_external_memory_dma_buf                        DONE (anv, radv, tu, v3dv)
-  VK_EXT_external_memory_host                           DONE (anv, radv)
+  VK_EXT_external_memory_dma_buf                        DONE (anv, radv, tu, v3dv, vn)
+  VK_EXT_external_memory_host                           DONE (anv, lvp, radv)
   VK_EXT_filter_cubic                                   DONE (tu/a650)
   VK_EXT_fragment_shader_interlock                      DONE (anv/gen9+)
   VK_EXT_global_priority                                DONE (anv, radv)
-  VK_EXT_image_drm_format_modifier                      DONE (anv, radv/gfx9+, tu)
+  VK_EXT_image_drm_format_modifier                      DONE (anv, radv/gfx9+, tu, vn)
   VK_EXT_image_robustness                               DONE (anv, radv)
   VK_EXT_index_type_uint8                               DONE (anv, lvp, radv/gfx8+, v3dv, tu)
   VK_EXT_inline_uniform_block                           DONE (anv, radv)
-  VK_EXT_line_rasterization                             DONE (anv, lvp, radv)
+  VK_EXT_line_rasterization                             DONE (anv, lvp, radv, tu)
   VK_EXT_memory_budget                                  DONE (anv, radv, tu)
   VK_EXT_memory_priority                                DONE (radv)
   VK_EXT_multi_draw                                     DONE (anv, lvp, radv)
   VK_EXT_pci_bus_info                                   DONE (anv, radv)
-  VK_EXT_physical_device_drm                            DONE (anv, radv)
-  VK_EXT_pipeline_creation_cache_control                DONE (anv, radv)
-  VK_EXT_pipeline_creation_feedback                     DONE (anv, radv)
+  VK_EXT_physical_device_drm                            DONE (anv, radv, v3dv)
+  VK_EXT_pipeline_creation_cache_control                DONE (anv, radv, v3dv)
+  VK_EXT_pipeline_creation_feedback                     DONE (anv, radv, v3dv)
   VK_EXT_post_depth_coverage                            DONE (anv/gfx10+, lvp, radv)
   VK_EXT_private_data                                   DONE (anv, lvp, radv, tu, v3dv)
-  VK_EXT_provoking_vertex                               DONE (anv, lvp, radv, tu)
-  VK_EXT_queue_family_foreign                           DONE (anv, radv)
+  VK_EXT_provoking_vertex                               DONE (anv, lvp, radv, tu, v3dv)
+  VK_EXT_queue_family_foreign                           DONE (anv, radv, vn)
   VK_EXT_robustness2                                    DONE (anv, radv, tu)
   VK_EXT_sample_locations                               DONE (anv, radv/gfx9-, tu/a650)
   VK_EXT_shader_atomic_float                            DONE (anv, radv)
+  VK_EXT_shader_atomic_float2                           DONE (anv/gen9+, radv)
   VK_EXT_shader_demote_to_helper_invocation             DONE (anv, radv, tu)
   VK_EXT_shader_image_atomic_int64                      DONE (radv)
   VK_EXT_shader_stencil_export                          DONE (anv/gen9+, lvp, radv, tu)
@@ -553,17 +553,18 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_subgroup_size_control                          DONE (anv, radv)
   VK_EXT_texel_buffer_alignment                         DONE (anv, radv)
   VK_EXT_transform_feedback                             DONE (anv, lvp, radv, tu, vn)
-  VK_EXT_vertex_attribute_divisor                       DONE (anv, radv, lvp, tu)
-  VK_EXT_vertex_input_dynamic_state                     DONE (lvp)
+  VK_EXT_vertex_attribute_divisor                       DONE (anv, radv, lvp, tu, v3dv)
+  VK_EXT_vertex_input_dynamic_state                     DONE (lvp, radv)
   VK_EXT_ycbcr_image_arrays                             DONE (anv, radv)
-  VK_ANDROID_external_memory_android_hardware_buffer    DONE (anv, radv)
-  VK_ANDROID_native_buffer                              DONE (anv, radv)
+  VK_ANDROID_external_memory_android_hardware_buffer    DONE (anv, radv, vn)
+  VK_ANDROID_native_buffer                              DONE (anv, radv, vn)
   VK_GOOGLE_decorate_string                             DONE (anv, lvp, radv)
   VK_GOOGLE_hlsl_functionality1                         DONE (anv, lvp, radv)
   VK_GOOGLE_user_type                                   DONE (anv, radv)
   VK_IMG_filter_cubic                                   DONE (tu/a650)
   VK_NV_compute_shader_derivatives                      DONE (anv, radv)
   VK_EXT_acquire_drm_display                            DONE (radv, anv)
+  VK_VALVE_mutable_descriptor_type                      DONE (radv, tu)
 
 
 OpenCL 1.0 -- all DONE:

docs/gallium/context.rst

@@ -118,6 +118,8 @@ objects. They all follow simple, one-method binding calls, e.g.
     levels. This corresponds to GL's ``PATCH_DEFAULT_OUTER_LEVEL``.
   * ``default_inner_level`` is the default value for the inner tessellation
     levels. This corresponds to GL's ``PATCH_DEFAULT_INNER_LEVEL``.
+* ``set_patch_vertices`` sets the number of vertices per input patch
+  for tessellation.
 
 * ``set_debug_callback`` sets the callback to be used for reporting
   various debug messages, eventually reported via KHR_debug and

docs/gallium/cso/rasterizer.rst

@@ -326,10 +326,15 @@ clip_halfz
     When true clip space in the z axis goes from [0..1] (D3D).  When false
     [-1, 1] (GL)
 
-depth_clip
-    When false, the near and far depth clipping planes of the view volume are
-    disabled and the depth value will be clamped at the per-pixel level, after
-    polygon offset has been applied and before depth testing.
+depth_clip_near
+    When false, the near depth clipping plane of the view volume is disabled.
+depth_clip_far
+    When false, the far depth clipping plane of the view volume is disabled.
+depth_clamp
+    Whether the depth value will be clamped to the interval defined by the
+    near and far depth range at the per-pixel level, after polygon offset has
+    been applied and before depth testing. Note that a clamp to [0,1] according
+    to GL rules should always happen even if this is disabled.
 
 clip_plane_enable
     For each k in [0, PIPE_MAX_CLIP_PLANES), if bit k of this field is set,

docs/gallium/screen.rst

@@ -80,6 +80,9 @@ The integer capabilities:
   disabling depth clipping (through pipe_rasterizer_state) separately for
   the near and far plane. If not, depth_clip_near and depth_clip_far will be
   equal.
+  ``PIPE_CAP_DEPTH_CLAMP_ENABLE``: Whether the driver is capable of
+  enabling depth clamping (through pipe_rasterizer_state) separately from depth
+  clipping. If not, depth_clamp will be the inverse of depth_clip_far.
 * ``PIPE_CAP_SHADER_STENCIL_EXPORT``: Whether a stencil reference value can be
   written from a fragment shader.
 * ``PIPE_CAP_TGSI_INSTANCEID``: Whether TGSI_SEMANTIC_INSTANCEID is supported
@@ -618,6 +621,8 @@ The integer capabilities:
 * ``PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART``: Driver requests all draws using a non-fixed restart index to be rewritten to use a fixed restart index.
 * ``PIPE_CAP_SUPPORTED_PRIM_MODES``: A bitmask of the ``pipe_prim_type`` enum values that the driver can natively support.
 * ``PIPE_CAP_SUPPORTED_PRIM_MODES_WITH_RESTART``: A bitmask of the ``pipe_prim_type`` enum values that the driver can natively support for primitive restart. Only useful if ``PIPE_CAP_PRIMITIVE_RESTART`` is also exported.
+* ``PIPE_CAP_PREFER_BACK_BUFFER_REUSE``: Only applies to DRI_PRIME. If 1, the driver prefers that DRI3 tries to use the same back buffer each frame. If 0, this means DRI3 will at least use 2 back buffers and ping-pong between them to allow the tiled->linear copy to run in parallel.
+* ``PIPE_CAP_DRAW_VERTEX_STATE``: Driver supports `pipe_screen::create_vertex_state/vertex_state_destroy` and `pipe_context::draw_vertex_state`. Only used by display lists and designed to serve vbo_save.
 
 .. _pipe_capf:
 

docs/gallium/tgsi.rst

@@ -3561,11 +3561,6 @@ interpolation should be done at, one of ``TGSI_INTERPOLATE_LOC_*``. Note that
 when per-sample shading is enabled, the implementation may choose to
 interpolate at the sample irrespective of the Location field.
 
-The CylindricalWrap bitfield specifies which register components
-should be subject to cylindrical wrapping when interpolating by the
-rasteriser. If TGSI_CYLINDRICAL_WRAP_X is set to 1, the X component
-should be interpolated according to cylindrical wrapping rules.
-
 
 Declaration Sampler View
 ^^^^^^^^^^^^^^^^^^^^^^^^

docs/isl/tiling.rst

@@ -246,6 +246,36 @@ ISL, we represent a W-tile as a tiling with a logical dimension of 64el x 64el
 but a physical size of 128B x 32rows.  This cleanly takes care of the pitch
 issue above and seems to nicely model the hardware.
 
+Tile4
+-----
+
+The tile4 format, introduced on Xe-HP, is somewhat similar to Y but with more
+internal shuffling.  Each tile4 tile is an 8x8 grid of cache lines arranged
+as follows:
+
+===== ===== ===== ===== ===== ===== ===== =====
+===== ===== ===== ===== ===== ===== ===== =====
+0x000 0x040 0x080 0x0a0 0x200 0x240 0x280 0x2a0
+0x100 0x140 0x180 0x1a0 0x300 0x340 0x380 0x3a0
+0x400 0x440 0x480 0x4a0 0x600 0x640 0x680 0x6a0
+0x500 0x540 0x580 0x5a0 0x700 0x740 0x780 0x7a0
+0x800 0x840 0x880 0x8a0 0xa00 0xa40 0xa80 0xaa0
+0x900 0x940 0x980 0x9a0 0xb00 0xb40 0xb80 0xba0
+0xc00 0xc40 0xc80 0xca0 0xe00 0xe40 0xe80 0xea0
+0xd00 0xd40 0xd80 0xda0 0xf00 0xf40 0xf80 0xfa0
+===== ===== ===== ===== ===== ===== ===== =====
+
+Each 64B cache line within the tile is laid out the same way as for a Y-tile,
+as 4 rows of 16B each:
+
+==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ====
+==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ====
+0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f
+0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f
+0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27 0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f
+0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39 0x3a 0x3b 0x3c 0x3d 0x3e 0x3f
+==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ====
+
 Tiling as a bit pattern
 -----------------------
 
@@ -281,6 +311,7 @@ the tile are given by the table below:
 :cpp:enumerator:`isl_tiling::ISL_TILING_X`  :math:`v_2` :math:`v_1` :math:`v_0` :math:`u_8` :math:`u_7` :math:`u_6` :math:`u_5` :math:`u_4` :math:`u_3` :math:`u_2` :math:`u_1` :math:`u_0`
 :cpp:enumerator:`isl_tiling::ISL_TILING_Y0` :math:`u_6` :math:`u_5` :math:`u_4` :math:`v_4` :math:`v_3` :math:`v_2` :math:`v_1` :math:`v_0` :math:`u_3` :math:`u_2` :math:`u_1` :math:`u_0`
 :cpp:enumerator:`isl_tiling::ISL_TILING_W`  :math:`u_5` :math:`u_4` :math:`u_3` :math:`v_5` :math:`v_4` :math:`v_3` :math:`v_2` :math:`u_2` :math:`v_1` :math:`u_1` :math:`v_0` :math:`u_0`
+:cpp:enumerator:`isl_tiling::ISL_TILING_4`  :math:`v_4` :math:`v_3` :math:`u_6` :math:`v_2` :math:`u_5` :math:`u_4` :math:`v_1` :math:`v_0` :math:`u_3` :math:`u_2` :math:`u_1` :math:`u_0`
 =========================================== =========== =========== =========== =========== =========== =========== =========== =========== =========== =========== =========== ===========
 
 Constructing the mapping this way makes a lot of sense when you think about

docs/nir/index.rst

@@ -11,3 +11,4 @@ stack.
    :maxdepth: 2
 
    alu
+   tex

docs/nir/tex.rst

@@ -0,0 +1,67 @@
+NIR Texture Instructions
+========================
+
+Even though texture instructions *could* be supported as intrinsics, the vast
+number of combinations mean that doing so is practically impossible. Instead,
+NIR has a dedicated texture instruction.  There are several texture operations:
+
+.. doxygenenum:: nir_texop
+
+As with other instruction types, there is still an array of sources, except
+that each source also has a *type* associated with it.  There are various
+source types, each corresponding to a piece of information that the different
+texture operations require.
+
+.. doxygenenum:: nir_tex_src_type
+
+Of particular interest are the texture/sampler deref/index/handle source types.
+First, note that textures and samplers are specified separately in NIR.  While
+not required for OpenGL, this is required for Vulkan and OpenCL.  Some
+OpenGL [ES] drivers have to deal with hardware that does not have separate
+samplers and textures.  While not recommended, an OpenGL-only driver may assume
+that the texture and sampler derefs will always point to the same resource, if
+needed.  Note that this pretty well paints your compiler into a corner and
+makes any future port to Vulkan or OpenCL harder, so such assumptions should
+really only be made if targeting OpenGL ES 2.0 era hardware.
+
+Also, like a lot of other resources, there are multiple ways to represent a
+texture in NIR. It can be referenced by a variable dereference, an index, or a
+bindless handle. When using an index or a bindless handle, the texture type
+information is generally not available.  To handle this, various information
+from the type is redundantly stored in the :cpp:struct:`nir_tex_instr` itself.
+
+.. doxygenstruct:: nir_tex_instr
+   :members:
+
+.. doxygenstruct:: nir_tex_src
+   :members:
+
+Texture instruction helpers
+---------------------------
+
+There are a number of helper functions for working with NIR texture
+instructions.  They are documented here in no particular order.
+
+.. doxygenfunction:: nir_tex_instr_create
+.. doxygenfunction:: nir_tex_instr_need_sampler
+.. doxygenfunction:: nir_tex_instr_result_size
+.. doxygenfunction:: nir_tex_instr_dest_size
+.. doxygenfunction:: nir_tex_instr_is_query
+.. doxygenfunction:: nir_tex_instr_has_implicit_derivative
+.. doxygenfunction:: nir_tex_instr_src_type
+.. doxygenfunction:: nir_tex_instr_src_size
+.. doxygenfunction:: nir_tex_instr_src_index
+.. doxygenfunction:: nir_tex_instr_add_src
+.. doxygenfunction:: nir_tex_instr_remove_src
+
+Texture instruction lowering
+----------------------------
+
+Because most hardware only supports some subset of all possible GLSL/SPIR-V
+texture operations, NIR provides a quite powerful lowering pass which is able
+to implement more complex texture operations in terms of simpler ones.
+
+.. doxygenfunction:: nir_lower_tex
+.. doxygenstruct:: nir_lower_tex_options
+   :members:
+.. doxygenenum:: nir_lower_tex_packing

docs/perfetto.rst

@@ -31,8 +31,17 @@ The exact supported features vary per driver:
    * - Driver
      - PPS Counters
      - Render Stages
+   * - Freedreno
+     - ``gpu.counters.msm``
+     - ``gpu.renderstages.msm``
+   * - Turnip
+     - ``gpu.counters.msm``
+     -
+   * - Intel
+     - ``gpu.counters.i915``
+     -
    * - Panfrost
-     - gpu.counters.panfrost
+     - ``gpu.counters.panfrost``
      -
 
 Run
@@ -76,6 +85,35 @@ Driver Specifics
 
 Below is driver specific information/instructions for the PPS producer.
 
+Freedreno / Turnip
+^^^^^^^^^^^^^^^^^^
+
+The Freedreno PPS driver needs root access to read system-wide
+performance counters, so you can simply run it with sudo:
+
+.. code-block:: console
+
+   sudo ./build/src/tool/pps/pps-producer
+
+Intel
+^^^^^
+
+The Intel PPS driver needs root access to read system-wide
+`RenderBasic <https://software.intel.com/content/www/us/en/develop/documentation/vtune-help/top/reference/gpu-metrics-reference.html>`__
+performance counters, so you can simply run it with sudo:
+
+.. code-block:: console
+
+   sudo ./build/src/tool/pps/pps-producer
+
+Another option to enable access wide data without root permissions would be running the following:
+
+.. code-block:: console
+
+   sudo sysctl dev.i915.perf_stream_paranoid=0
+
+Alternatively using the ``CAP_PERFMON`` permission on the binary should work too.
+
 Panfrost
 ^^^^^^^^
 

docs/release-calendar.csv

@@ -1,9 +1,9 @@
-21.0,2021-05-05,21.0.4,Dylan Baker,This is the last planned release of the 21.0.x series.
-21.1,2021-07-14,21.1.5,Eric Engestrom,
-21.1,2021-07-28,21.1.6,Eric Engestrom,
-21.1,2021-08-11,21.1.7,Eric Engestrom,
-21.1,2021-08-25,21.1.8,Eric Engestrom,
-21.2,2021-07-14,21.2.0-rc1,Dylan Baker
-,2021-07-21,21.2.0-rc2,Dylan Baker
-,2021-07-28,21.2.0-rc3,Dylan Baker
-,2021-08-04,21.2.0-rc4,Dylan Baker,Or 21.2.0 final.
+21.2,2021-10-13,21.2.4,Dylan Baker,
+,2021-10-27,21.2.5,Dylan Baker,
+,2021-11-10,21.2.6,Dylan Baker,
+,2021-11-24,21.2.7,Dylan Baker,
+,2021-12-08,21.2.8,Dylan Baker,Last planned 21.2.x release.
+21.3,2021-10-13,21.3.0-rc1,Eric Engestrom,
+,2021-10-20,21.3.0-rc2,Eric Engestrom,
+,2021-10-27,21.3.0-rc3,Eric Engestrom,
+,2021-11-03,21.3.0-rc4,Eric Engestrom,

docs/relnotes.rst

@@ -3,6 +3,13 @@ Release Notes
 
 The release notes summarize what's new or changed in each Mesa release.
 
+-  :doc:`21.2.3 release notes <relnotes/21.2.3>`
+-  :doc:`21.2.2 release notes <relnotes/21.2.2>`
+-  :doc:`21.1.8 release notes <relnotes/21.1.8>`
+-  :doc:`21.1.7 release notes <relnotes/21.1.7>`
+-  :doc:`21.2.0 release notes <relnotes/21.2.0>`
+-  :doc:`21.1.6 release notes <relnotes/21.1.6>`
+-  :doc:`21.1.5 release notes <relnotes/21.1.5>`
 -  :doc:`21.1.4 release notes <relnotes/21.1.4>`
 -  :doc:`21.1.3 release notes <relnotes/21.1.3>`
 -  :doc:`21.1.2 release notes <relnotes/21.1.2>`
@@ -338,6 +345,13 @@ release notes, or in the `old docs`_.
    :maxdepth: 1
    :hidden:
 
+   relnotes/21.2.3
+   relnotes/21.2.2
+   relnotes/21.1.8
+   relnotes/21.1.7
+   relnotes/21.2.0
+   relnotes/21.1.6
+   relnotes/21.1.5
    relnotes/21.1.4
    relnotes/21.1.3
    relnotes/21.1.2

docs/relnotes/21.0.3.rst

@@ -2,6 +2,8 @@ Mesa 21.0.3 Release Notes / 2021-04-21
 ======================================
 
 Mesa 21.0.3 is a bug fix release which fixes bugs found since the 21.0.2 release.
+This is the last release of the 21.0 series, please migrate to 21.1 as soon as
+possible.
 
 Mesa 21.0.3 implements the OpenGL 4.6 API, but the version reported by
 glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /

docs/relnotes/21.1.5.rst

@@ -0,0 +1,143 @@
+Mesa 21.1.5 Release Notes / 2021-07-14
+======================================
+
+Mesa 21.1.5 is a bug fix release which fixes bugs found since the 21.1.4 release.
+
+Mesa 21.1.5 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.1.5 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d  mesa-21.1.5.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- [build error] macros.h:88:26: error: size of unnamed array is negative
+- Game Issue: Nuclear Throne crashes in RadeonSI
+- Crash in glLinkProgram while trying to craft the link error
+- Shader compilation memory leaks
+- Wolfenstein II: The New Colossus - Screen goes black in some cases
+- SpaceEngine in Steam Proton cannot start with Mesa >=20.3
+- [bisected] KDE plasma menu text renders like stretched strangely [amdgpu]
+- Luna Sky Crashes on Launch
+- Mesa crashes on undefined texture behaviour
+- Mesa crashes on undefined texture behaviour
+- cache_test uses uninitialized stack memory
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (1):
+
+- nir: Fix constant folding for irhadd/urhadd
+
+Bas Nieuwenhuizen (1):
+
+- ac/surface: Handle non-retiled displayable DCC correctly for modifiers.
+
+Connor Abbott (1):
+
+- ir3: Fix infinite loop in scheduler when splitting
+
+Danylo Piliaiev (1):
+
+- glsl: Prohibit implicit conversion of mem parameter in atomicOP functions
+
+Dave Airlie (1):
+
+- draw: fix tessellation output vertex size calculation
+
+Eric Engestrom (4):
+
+- .pick_status.json: Update to e4f762ac346f31fc1fd201aecdc375348be5075f
+- zink: mark a bunch of zink-piglit-quick_gl tests as flakes
+- .pick_status.json: Update to c704bb630d21e0a30500e9d8f42493ede3cc55ae
+- .pick_status.json: Mark e5d158881b3e12270521d7081b4bba0ac2108d2e as denominated
+
+Heinrich Fink (1):
+
+- softpipe: add missing sentinel to debug option array
+
+Jason Ekstrand (1):
+
+- iris: Don't leak the surface if uncompressed re-interp fails
+
+Lionel Landwerlin (1):
+
+- intel/perf: use the right popcount for 64bits
+
+Marek Olšák (2):
+
+- ac/surface/tests: fix the ARM build
+- radeonsi,radv: fix a late alloc deadlock with <= 6 CUs per SA
+
+Michel Dänzer (3):
+
+- Convert most remaining free-form fall-through comments to FALLTHROUGH
+- osmesa: Replace default case FALLTHROUGH annotation by following return
+- Fix up leftover "state_trackers" references to "frontends"
+
+Pierre-Eric Pelloux-Prayer (4):
+
+- radeonsi: fix fb_too_small condition
+- radeonsi/gfx7: always sync pfp/me
+- ac/surface: don't print stencil info if tex has no stencil
+- radeonsi/driconf: add workaround for SpaceEngine
+
+Qiang Yu (1):
+
+- st/mesa: fix size miss match for some check
+
+Rob Clark (2):
+
+- freedreno: Consolidate needs_flush and clearing last_fence
+- freedreno/a6xx: Fix framebuffer_barrier crash
+
+Samuel Pitoiset (2):
+
+- radv: disable DCC for DOOM 2016 and Wolfenstein II
+- aco: fix shared_atomic_comp_swap if the second source isn't a VGPR
+
+Thomas H.P. Andersen (3):
+
+- nir: return progress from nir_lower_packing
+- nir/ifind_msb_rev: fix input check
+- broadcom/compiler: fix add vs. mul
+
+Timothy Arceri (7):
+
+- util/tests: initialise key in cache_test
+- mesa: don't crash on incorrect texture use
+- i965: don't crash on incorrect texture use
+- util/driconf: add new ignore_write_to_readonly_var workaround
+- util: add some workarounds for the game Luna Sky
+- glsl: force_glsl_version to shaders with no defined version
+- util/radeonsi: add radeonsi workaround for Nuclear Throne
+
+Vinson Lee (1):
+
+- st/xa: Mark default xa_get_pipe_format case unreachable.
+
+Yevhenii Kolesnikov (1):
+
+- intel: fix leaking memory on shader creation

docs/relnotes/21.1.6.rst

@@ -0,0 +1,154 @@
+Mesa 21.1.6 Release Notes / 2021-07-28
+======================================
+
+Mesa 21.1.6 is a bug fix release which fixes bugs found since the 21.1.5 release.
+
+Mesa 21.1.6 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.1.6 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37  mesa-21.1.6.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- [RADV] FSR in Resident Evil: Village looks very pixelated on Polaris
+- Crash in update_buffers after closing KDE "splash screen" downloader
+- Crash in update_buffers after closing KDE "splash screen" downloader
+- radeonsi: persistent, read-only buffer maps are slow to read
+- substance painter flickering with jagged texture and masks shown black
+- radv: FP16 mode in FidelityFX FSR doesn't look right
+- [RADV] Blocky corruption in Scarlet Nexus and vkd3d-proton 2.4
+- Radeon RX580 and 5700 XT: Reloading ARB assembly shaders causes very glitchy rendering
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (1):
+
+- targets/graw-xlib: Add missing dep_x11
+
+Chia-I Wu (2):
+
+- egl/surfaceless: try kms_swrast before swrast
+- meson: allow egl_native_platform to be specified
+
+Connor Abbott (1):
+
+- freedreno/computerator: Fix local_size typo
+
+Daniel Schürmann (1):
+
+- aco/optimizer: ensure to not erase high bits when propagating packed constants
+
+Daniel Stone (2):
+
+- egl/wayland: Error on invalid native window
+- egl/wayland: Allow EGLSurface to outlive wl_egl_window
+
+Dave Airlie (2):
+
+- softpipe/aniso: move DDQ calculation to after scaling.
+- llvmpipe: add support for time elapsed queries.
+
+Eric Engestrom (4):
+
+- .pick_status.json: Mark a9c9a9938d6d2ead6f08ccf5256c95801fbc864f as backported
+- .pick_status.json: Update to 376fb4f55f080929df8ca5a2a975fc88a00eec06
+- .pick_status.json: Update to 1d6c790f9f6c373e667de955822b1048c7073ba3
+- .pick_status.json: Update to 73262d4bd4a4637a332264a165c62ce3209d03fb
+
+Erik Faye-Lund (3):
+
+- zink: remove duplicate format-mapping on little-endian
+- vulkan: do not map zero-sized region of memory
+- vulkan: allocate host-visible memory for swapchain images
+
+Ian Romanick (1):
+
+- nir/gcm: Clear out pass_flags before starting
+
+Jason Ekstrand (2):
+
+- iris: Re-emit MEDIA_VFE_STATE for variable group size shaders
+- anv: Handle errors properly in anv_i915_query
+
+Jose Maria Casanova Crespo (1):
+
+- v3d/driconf: Expose non-MSAA texture limits for mutter and gnome-shell
+
+Joshua Ashton (1):
+
+- lavapipe: Use common Vulkan format helpers
+
+Juan A. Suarez Romero (1):
+
+- broadcom/compiler: emit TMU flush before a jump
+
+Karol Herbst (1):
+
+- nv50/ir/nir: fix smem size for GL
+
+Marek Olšák (2):
+
+- radeonsi: don't expose no-attachment MSAA 16x on all 1 RB chips due to issues
+- st/mesa: always use PIPE_USAGE_STAGING for GL_MAP_READ_BIT usage
+
+Mauro Rossi (1):
+
+- egl/android: include "util/compiler.h" for FALLTHROUGH macro
+
+Mike Blumenkrantz (1):
+
+- util/foz: stop crashing on destroy if prepare hasn't been called
+
+Olivier Fourdan (1):
+
+- radeonsi: Check aux_context on si_destroy_screen()
+
+Pierre-Eric Pelloux-Prayer (2):
+
+- mesa: clear shader_info::is_lowered in prog_to_nir
+- mesa: fix bindless uniform samplers update
+
+Rhys Perry (1):
+
+- aco: don't create v_madmk_f32/v_madak_f32 from v_fma_legacy_f16
+
+Rob Clark (1):
+
+- freedreno/ir3: Don't force RTNE if rounding mode is undefined
+
+Samuel Pitoiset (1):
+
+- radv: only init the TC-compat ZRANGE metadata for the depth aspect
+
+Timothy Arceri (3):
+
+- glsl: replace some C++ code with C
+- util: add workaround for Full Bore
+- glsl: relax rule on varying matching for shaders older than 4.20
+
+Vasily Khoruzhick (1):
+
+- lima: handle fp16 vertex formats

docs/relnotes/21.1.7.rst

@@ -0,0 +1,186 @@
+Mesa 21.1.7 Release Notes / 2021-08-11
+======================================
+
+Mesa 21.1.7 is a bug fix release which fixes bugs found since the 21.1.6 release.
+
+Mesa 21.1.7 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.1.7 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb  mesa-21.1.7.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- Miscompilation of a switch case
+- [radeonsi][regression] CPU is being used ~10 times more than usual after c5478f9067f.
+- dEQP-VK.wsi.android.swapchain.create#image_swapchain_create_info crash on Android R
+- The image is distorted while use iGPU(Intel GPU) rendering and output via dGPU (AMD GPU)
+- lima: regression in plbu scissors cmd
+- Incorrect rendering
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (3):
+
+- pan/bi: Restrict swizzles on same cycle temporaries
+- nir/lower_mediump_io: Don't remap base unless needed
+- nir/lower_mediump: Fix metadata in all passes
+
+Bas Nieuwenhuizen (9):
+
+- util/fossilize_db: Update parsed_offset correctly.
+- util/fossilize_db: Reset file position to parsed_offset on cache_offset read failure.
+- util/fossilize_db: Flush files after header write.
+- util/fossilize_db: Be conservative about header length check for locking.
+- util/fossilize_db: Only allocate entries after full read.
+- util/fossilize_db: Use uint64_t for file size.
+- util/fossilize_db: Unlock the cache file if the entry already exists.
+- util/fossilize_db: Add extra flock mutex.
+- radv: Allocate space for inline push constants.
+
+Chia-I Wu (1):
+
+- vulkan/wsi/x11: do not inherit last_present_mode
+
+Connor Abbott (1):
+
+- ir3: Preserve gl_ViewportIndex in the binning shader
+
+Dave Airlie (3):
+
+- teximage: return correct desktop GL error for compressedteximage
+- intel/fs: restrict max push length on older GPUs to a smaller amount
+- virgl: disable anisotropic filtering.
+
+Dylan Baker (1):
+
+- freedreno/ir3: Add build id to the disassembler test
+
+Eric Engestrom (9):
+
+- .pick_status.json: Update to 7055282231cdad23e7b23fb49a2f953a99797f8a
+- .pick_status.json: Update to 2f06642b06c94f07f4bfe3df32b25659428c9144
+- .pick_status.json: Mark 6ccf11ac2b951963407601b5b1109b45a972e48e as denominated
+- .pick_status.json: Update to 2f06642b06c94f07f4bfe3df32b25659428c9144
+- .pick_status.json: Update to 353e6323936b812884fa677c25bdba91554881b7
+- .pick_status.json: Update to 4128acdee32eadfef1fb8c3c3ce2e512a267cdf4
+- pick-ui: drop assert that optional argument is passed
+- pick-ui: show nomination type in the UI
+- pick-ui: show commit date
+
+Erico Nunes (1):
+
+- lima: avoid crash with negative viewport values
+
+Hoe Hao Cheng (1):
+
+- zink: make codegen compatible with python 3.5
+
+Jesse Natalie (1):
+
+- mesa/main: Check for fbo attachments when importing EGL images to textures
+
+Joshua Watt (1):
+
+- v3d, vc4: Fix dmabuf import for non-scanout buffers
+
+Juan A. Suarez Romero (1):
+
+- gallium/hud: initialize query
+
+Karol Herbst (1):
+
+- nv30: fix emulated vertex index buffers
+
+Lepton Wu (1):
+
+- gallium: Reset {d,r}Priv in dri_unbind_context
+
+Lionel Landwerlin (3):
+
+- loader/dri3: create linear buffer with scanout support
+- anv: fix submission batching with perf queries
+- anv: don't try to access Android swapchains
+
+Lucas Stach (2):
+
+- renderonly: don't complain when GPU import fails
+- etnaviv: always try to create KMS side handles for imported resources
+
+Marcin Ślusarz (1):
+
+- glsl: evaluate switch expression once
+
+Mike Blumenkrantz (1):
+
+- zink: use array size in spirv bo length calculations
+
+Philipp Zabel (1):
+
+- etnaviv: fix gbm_bo_get_handle_for_plane for multiplanar images
+
+Pierre Moreau (2):
+
+- clover/spirv: Properly size 3-component vector args
+- clover/nir: Set constant buffer pointer size to host
+
+Pierre-Eric Pelloux-Prayer (3):
+
+- gallium/va: don't use key=NULL in hash tables
+- amd/registers: fix fields conflict detection
+- radeonsi: don't create an infinite number of variants
+
+Rhys Perry (1):
+
+- nir/algebraic: fix imod by negative power-of-two
+
+Samuel Pitoiset (1):
+
+- radv: fix selecting the first active CU when profiling with SQTT
+
+Simon Ser (5):
+
+- etnaviv: fix renderonly check in etna_resource_alloc
+- etnaviv: fail in get_handle(TYPE_KMS) without a scanout resource
+- freedreno: fail in get_handle(TYPE_KMS) without a scanout resource
+- panfrost: fail in get_handle(TYPE_KMS) without a scanout resource
+- lima: fail in get_handle(TYPE_KMS) without a scanout resource
+
+Thomas H.P. Andersen (1):
+
+- nine: Fix assert in tx_src_param
+
+Timothy Arceri (1):
+
+- intel/compiler: make sure swizzle is applied to if condition
+
+Yevhenii Kolesnikov (2):
+
+- glsl: Add operator for .length() method on implicitly-sized arrays
+- glsl: Properly handle .length() of an unsized array
+
+Zhu Yuliang (1):
+
+- gallium/vl: don't leak fd in vl_dri3_screen_create

docs/relnotes/21.1.8.rst

@@ -0,0 +1,105 @@
+Mesa 21.1.8 Release Notes / 2021-09-08
+======================================
+
+Mesa 21.1.8 is a bug fix release which fixes bugs found since the 21.1.7 release.
+
+Mesa 21.1.8 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 21.1.8 implements the Vulkan 1.2 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    5cd32f5d089dca75300578a3d771a656eaed652090573a2655fe4e7022d56bfc  mesa-21.1.8.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- llvmpipe doesn't compile a valid shader with an useless switch
+- GetFragDataLocation(prog, "gl_FragColor") generates INVALID_OPERATION, but specs don't say it should
+- Possible miscompilation of a comparison with unsigned zero
+- dEQP-VK.wsi.android.swapchain.create#image_swapchain_create_info crash on Android R
+
+
+Changes
+-------
+
+Alyssa Rosenzweig (1):
+
+- drm-shim: Support kernels with >4k pages
+
+Boris Brezillon (1):
+
+- panfrost: Fix pan_blitter_emit_bifrost_blend()
+
+Eric Engestrom (3):
+
+- .pick_status.json: Update to 8bb9e9e76fa1f062c8da9536e9ee209b2dc268f7
+- Revert "python: Explicitly add the 'L' suffix on Python 3"
+- isl: drop left-over comment
+
+Erik Faye-Lund (2):
+
+- gallium/nir/tgsi: fixup indentation
+- gallium/nir/tgsi: initialize file_max for inputs
+
+Ilia Mirkin (1):
+
+- mesa: don't return errors for gl_* GetFragData* queries
+
+Jason Ekstrand (1):
+
+- anv: Set CONTEXT_PARAM_RECOVERABLE to false
+
+Lionel Landwerlin (1):
+
+- anv/android: handle image bindings from gralloc buffers
+
+Mao, Marc (1):
+
+- iris: declare padding for iris_vue_prog_key
+
+Marcin Ślusarz (2):
+
+- nir/builder: invalidate metadata per function
+- glsl/opt_algebraic: disable invalid optimization
+
+Mike Blumenkrantz (1):
+
+- nir/lower_vectorize_tess_levels: set num_components for vectorized loads
+
+Roman Stratiienko (1):
+
+- lima: Implement lima_resource_get_param() callback
+
+Simon Ser (4):
+
+- etnaviv: add stride, offset and modifier to resource_get_param
+- panfrost: implement resource_get_param
+- vc4: implement resource_get_param
+- v3d: implement resource_get_param
+
+Timothy Arceri (1):
+
+- glsl: fix variable scope for instructions inside case statements
+
+Vinson Lee (2):
+
+- meson: Remove duplicate xvmc in build summary.
+- nir: Initialize evaluate_cube_face_index_amd dst.x.

docs/relnotes/21.2.1.rst

@@ -1,218 +0,0 @@
-Mesa 21.2.1 Release Notes / 2021-08-19
-======================================
-
-Mesa 21.2.1 is a bug fix release which fixes bugs found since the 21.2.0 release.
-
-Mesa 21.2.1 implements the OpenGL 4.6 API, but the version reported by
-glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 4.6. OpenGL
-4.6 is **only** available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-
-Mesa 21.2.1 implements the Vulkan 1.2 API, but the version reported by
-the apiVersion property of the VkPhysicalDeviceProperties struct
-depends on the particular driver being used.
-
-SHA256 checksum
----------------
-
-::
-
-   2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787  mesa-21.2.1.tar.xz
-
-
-New features
-------------
-
-- None
-
-
-Bug fixes
----------
-
-- Possible miscompilation of a comparison with unsigned zero
-- dEQP-VK.wsi.android.swapchain.create#image_swapchain_create_info crash on Android R
-- Nine Regression with util: Switch the non-block formats to unpacking rgba rows instead of rects.
-- panfrost G31 Unreal Tournament - various glitches (apitrace)
-- Miscompilation of a switch case
-- [radeonsi][regression] CPU is being used ~10 times more than usual after c5478f9067f.
-- dEQP-VK.wsi.android.swapchain.create#image_swapchain_create_info crash on Android R
-
-
-Changes
--------
-
-Alyssa Rosenzweig (5):
-
-- nir/lower_mediump_io: Don't remap base unless needed
-- nir/lower_mediump: Fix metadata in all passes
-- drm-shim: Support kernels with >4k pages
-- panfrost: Fix leak of render node fd
-- panfrost: Rewrite the clear colour packing code
-
-Axel Davy (1):
-
-- util: Fix translate from block compressed to rgba
-
-Bas Nieuwenhuizen (10):
-
-- util/fossilize_db: Update parsed_offset correctly.
-- util/fossilize_db: Reset file position to parsed_offset on cache_offset read failure.
-- util/fossilize_db: Flush files after header write.
-- util/fossilize_db: Be conservative about header length check for locking.
-- util/fossilize_db: Only allocate entries after full read.
-- util/fossilize_db: Use uint64_t for file size.
-- util/fossilize_db: Unlock the cache file if the entry already exists.
-- util/fossilize_db: Add extra flock mutex.
-- radv: Allocate space for inline push constants.
-- radv: Use correct signedness in misalign test.
-
-Boris Brezillon (1):
-
-- panfrost: Fix pan_blitter_emit_bifrost_blend()
-
-Charmaine Lee (1):
-
-- aux/draw: Check for preferred IR to take nir-to-tgsi path in draw module
-
-Chia-I Wu (2):
-
-- iris, crocus: add idep_genxml to per_hw target dependencies
-- venus: free queues after vkDestroyDevice is emitted
-
-Dave Airlie (7):
-
-- virgl: disable anisotropic filtering.
-- wl/shm: don't fetch formats if not requested.
-- crocus/blt: add pitch/offset checks to fix blt corruption
-- crocus: align staging resource pitch on gen4/5 to allow BLT usage.
-- intel/vec4: sel.cond writes the flags on Gfx4 and Gfx5
-- crocus/blt: add pitch/offset checks to fix blt corruption
-- crocus: align staging resource pitch on gen4/5 to allow BLT usage.
-
-Dylan Baker (15):
-
-- docs: Add sha256 sum for 21.2.0
-- .pick_status.json: Update to 8918a809ced3551f822abb45d751d31b54ad67da
-- .pick_status.json: Update to 6ccf11ac2b951963407601b5b1109b45a972e48e
-- bin/gen_release_notes: Add basic tests for parsing issues
-- bin/gen_release_notes: Don't consider issues for other projects
-- bin/gen_release_notes: Fix commits with multiple Closes:
-- .pick_status.json: Update to 0165fde82c41f94c5d6f432f9f444871405a7d49
-- .pick_status.json: Update to 7ae3881a4bf989436b602b30b9a91602435e47a6
-- .pick_status.json: Update to 0dd0a92b243487e83d8d96532873f319719248e5
-- .pick_status.json: Update to 01b0935d315347cfd06bb5d8bb1a6b59913f94cc
-- .pick_status.json: Update to 688d11e4e821ec3934abe571de9899390beceb54
-- .pick_status.json: Update to 04bd2a12451160609b6f163e1a86437948a48fcd
-- .pick_status.json: Update to 441e490f5a13d96255810f38260445437033be63
-- .pick_status.json: Update to 726fdf3385428b52b773e9049ce6033d02c631c1
-- .pick_status.json: Update to 35c3f5f08b7b11f3896412fb5778f127be329615
-
-Eric Engestrom (5):
-
-- pick-ui: drop assert that optional argument is passed
-- pick-ui: show nomination type in the UI
-- pick-ui: show commit date
-- Revert "python: Explicitly add the 'L' suffix on Python 3"
-- isl: drop left-over comment
-
-Ian Romanick (3):
-
-- intel/fs: sel.cond writes the flags on Gfx4 and Gfx5
-- Revert "nir/algebraic: Convert some f2u to f2i"
-- intel/fs: sel.cond writes the flags on Gfx4 and Gfx5
-
-Icecream95 (2):
-
-- pan/bi: Use the computed scale for fexp NaN propagation
-- panfrost: Only allow colour blit shaders to be killed
-
-Jason Ekstrand (2):
-
-- intel/isl: Explicitly set offset_B = 0 in get_uncomp_surf for arrays
-- intel/isl: Add a missing assert in isl_tiling_get_intratile_offset_sa
-
-Jesse Natalie (1):
-
-- CI: Update Windows quick_gl baseline for mysterious new passes
-
-Lionel Landwerlin (3):
-
-- anv: don't try to access Android swapchains
-- nir/lower_shader_calls: remove empty phis
-- anv/android: handle image bindings from gralloc buffers
-
-Lucas Stach (2):
-
-- renderonly: don't complain when GPU import fails
-- etnaviv: always try to create KMS side handles for imported resources
-
-Marcin Ślusarz (3):
-
-- glsl: evaluate switch expression once
-- nir/builder: invalidate metadata per function
-- glsl/opt_algebraic: disable invalid optimization
-
-Michel Dänzer (1):
-
-- ci: Drop "success" job
-
-Michel Zou (1):
-
-- radv: fix build with mingw
-
-Mike Blumenkrantz (2):
-
-- zink: sum available memory heaps instead of assigning
-- zink: simplify else clause for mem info gathering
-
-Neha Bhende (1):
-
-- aux/draw: use nir_to_tgsi for draw shader in llvm path
-
-Pierre-Eric Pelloux-Prayer (3):
-
-- st/pbo: only use x coord when reading a PIPE_TEXTURE_1D
-- st/pbo: set nir_tex_instr::is_array field
-- radeonsi: don't create an infinite number of variants
-
-Rhys Perry (1):
-
-- nir/algebraic: fix imod by negative power-of-two
-
-Roland Scheidegger (1):
-
-- aux/cso: try harder to keep cso state in sync on cso context unbind
-
-Roman Stratiienko (3):
-
-- AOSP: Extract version from libdrm instead of hardcoding it.
-- AOSP: Update timestamps of target binaries
-- lima: Implement lima_resource_get_param() callback
-
-Samuel Pitoiset (2):
-
-- radv: fix initializing the DS clear metadata value for separate aspects
-- radv: flush caches before performing separate depth/stencil aspect init
-
-Tapani Pälli (2):
-
-- crocus: take a reference to memobj bo in crocus_resource_from_memobj
-- crocus: disable depth and d+s formats with memory objects
-
-Thong Thai (3):
-
-- gallium/auxiliary/vl: Add additional deinterlace enum and tracking
-- gallium/util: add half texel offset param to util_compute_blit
-- frontends/va/postproc: Keep track of deinterlacing method being used
-
-Timur Kristóf (2):
-
-- aco: Use Navi 10 empty NGG output workaround on NGG culling shaders.
-- radv: Write RSRC2_GS for NGGC when pipeline is dirty but not emitted.
-
-Vinson Lee (2):
-
-- meson: Remove duplicate xvmc in build summary.
-- nir: Initialize evaluate_cube_face_index_amd dst.x.

docs/relnotes/21.2.4.rst

@@ -1,147 +0,0 @@
-Mesa 21.2.4 Release Notes / 2021-10-14
-======================================
-
-Mesa 21.2.4 is a bug fix release which fixes bugs found since the 21.2.3 release.
-
-Mesa 21.2.4 implements the OpenGL 4.6 API, but the version reported by
-glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 4.6. OpenGL
-4.6 is **only** available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-
-Mesa 21.2.4 implements the Vulkan 1.2 API, but the version reported by
-the apiVersion property of the VkPhysicalDeviceProperties struct
-depends on the particular driver being used.
-
-SHA256 checksum
----------------
-
-::
-
-   fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44  mesa-21.2.4.tar.xz
-
-
-New features
-------------
-
-- None
-
-
-Bug fixes
----------
-
-- RADV: Rendering issues in Resident Evil 2 with NGGC
-- crocus:  Incorrect stride when used through prime
-- anv: descriptorBindingUniformBufferUpdateAfterBind feature is not supported
-
-
-Changes
--------
-
-Alyssa Rosenzweig (3):
-
-- panfrost: Move special_varying to compiler definitions
-- panfrost: Fix off-by-one in varying count assert
-- panfrost: Don't set CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER
-
-Bas Nieuwenhuizen (2):
-
-- amd/common: Add fallback for misreported clocks for RGP.
-- radv: Handle copying zero queries.
-
-Chia-I Wu (1):
-
-- radv: plug leaks in radv_device_init_accel_struct_build_state
-
-Connor Abbott (1):
-
-- ir3: Use source in ir3_output_conv_src_type()
-
-Dave Airlie (7):
-
-- crocus/query: don't loop on ready status after gpu hang.
-- device_select: close dri3 fd after using it.
-- crocus: Honor scanout requirement from DRI
-- crocus/gen5: reemit shaders on gen5 after new program cache bo.
-- crocus/gen5: add dirty flags for urb fences.
-- crocus/gen6: don't reemit the svbi when debugging
-- gallivm/format: clamp SINT conversion rather than truncate.
-
-Dylan Baker (7):
-
-- docs" Add SHA256 sum for mesa 21.2.3
-- .pick_status.json: Update to fb8f532ea1bbd9c959e0f59c652347e435a71f91
-- .pick_status.json: Update to d2543658ef6fe0ad59af217a09a931d3b6174a43
-- .pick_status.json: Update to 729991e09cd28550001ae63710ab929d95b115bc
-- .pick_status.json: Update to 3a18963b0876af2aa0d60dd9917e69d409ce4d6e
-- .pick_status.json: Update to ced950e42f4a95ef410e63c2d26a2119e0c3c40b
-- .pick_status.json: Update to 783f8f728ce8e77885adbc7b2c12c39c3e3e5198
-
-Emma Anholt (2):
-
-- gallium/dri: Make YUV formats we're going to emulate external-only.
-- i915g: Check for the scanout-layout conditions before setting level info.
-
-Filip Gawin (1):
-
-- r300: implement forgotten tgsi's cases of textures
-
-Gert Wollny (1):
-
-- mesa: signal driver when buffer is bound to different texture format
-
-Icecream95 (1):
-
-- pan/mdg: Use the correct swizzle for condition moves
-
-Jason Ekstrand (1):
-
-- vulkan/shader_module: Fix the lifetime of temporary shader modules
-
-Kai Wasserbäch (2):
-
-- gallivm: add new wrapper around Module::setOverrideStackAlignment()
-- gallivm: fix FTBFS on i386 with LLVM >= 13, StackAlignmentOverride is gone
-
-Lionel Landwerlin (3):
-
-- anv: enable UBO indexing
-- anv: add missing transition handling bits
-- spirv: deal with null pointers
-
-Marek Olšák (2):
-
-- radeonsi: add back a workaround for DCC MSAA on gfx9 due to conformance issues
-- ac/surface: don't overwrite DCC settings for imported buffers
-
-Pavel Asyutchenko (1):
-
-- llvmpipe: fix crash when doing FB fetch + gl_FragDepth write in one shader
-
-Qiang Yu (1):
-
-- loader/dri3: fix swap out of order when changing swap interval
-
-Rob Clark (1):
-
-- freedreno/drm: Move pipe unref after fence removal
-
-Samuel Pitoiset (2):
-
-- radv: fix adjusting the frag coord when RADV_FORCE_VRS is enabled
-- aco: fix load_barycentric_at_{offset,sample}
-
-Timur Kristóf (3):
-
-- aco: Fix small primitive precision.
-- aco: Fix determining whether any culling is enabled.
-- ac/nir/cull: Accept NaN and +/- Inf in face culling.
-
-Vasily Khoruzhick (1):
-
-- lima: split_load_input: don't split unaligned vec2
-
-Vinson Lee (1):
-
-- pps: Avoid duplicate elements in with_datasources array.

docs/relnotes/21.2.5.rst

@@ -1,138 +0,0 @@
-Mesa 21.2.5 Release Notes / 2021-10-28
-======================================
-
-Mesa 21.2.5 is a bug fix release which fixes bugs found since the 21.2.4 release.
-
-Mesa 21.2.5 implements the OpenGL 4.6 API, but the version reported by
-glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 4.6. OpenGL
-4.6 is **only** available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-
-Mesa 21.2.5 implements the Vulkan 1.2 API, but the version reported by
-the apiVersion property of the VkPhysicalDeviceProperties struct
-depends on the particular driver being used.
-
-SHA256 checksum
----------------
-
-::
-
-   8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb  mesa-21.2.5.tar.xz
-
-
-New features
-------------
-
-- None
-
-
-Bug fixes
----------
-
-- RADV: Resident Evil Village needs invariantgeom when NGG culling is enabled
-- [radeonsi] Euro Truck Simulator 2: broken mimimap
-- [regression][bisected] Launching Valheim OpenGL game leads to GPU Hang
-- Android Meson build regression: hardware/system information apps crash on Raspberry Pi 4
-- anv: dEQP-VK.graphicsfuzz.cov-multiple-one-iteration-loops-global-counter-write-matrices fails
-
-
-Changes
--------
-
-Alyssa Rosenzweig (4):
-
-- panfrost: Detect implementations support AFBC
-- panfrost,panvk: Use dev->has_afbc instead of quirks
-- panfrost: Fix gl_FragColor lowering
-- panfrost: Add internal afbc_formats
-
-Boris Brezillon (3):
-
-- vulkan: Fix weak symbol emulation when compiling with MSVC
-- vulkan: Set unused entrypoints to vk_entrypoint_stub when compiling with MSVC
-- vulkan: Fix entrypoint generation when compiling for x86 with MSVC
-
-Daniel Schürmann (1):
-
-- driconf: set vk_x11_strict_image_count for Wolfenstein: Youngblood
-
-Dylan Baker (7):
-
-- docs: add sha256 sum for 21.2.4 release
-- .pick_status.json: Update to 1c0eb7aa78bac4494dbff0c502a8c09e23a4c123
-- .pick_status.json: Update to d43f89f17a8259c842016fa559fa33c1c6279105
-- .pick_status.json: Update to be6d584de43966ee58bf1fcac156ebf8040081d1
-- .pick_status.json: Update to 39f25945311e1385a54ddd17f71f9f6023d97256
-- .pick_status.json: Update to dc74285d32df9c09eb896bc4571066402d32d10b
-- .pick_status.json: Update to 16f838576cf29e26f1af198ac93a0fb3a3cfad8f
-
-Emma Anholt (1):
-
-- radeonsi: Fix leak of screen->perfcounters.
-
-Ian Romanick (1):
-
-- nir/loop_unroll: Always unroll loops that iterate at most once
-
-Jan Beich (1):
-
-- meson: disable -Werror=thread-safety on FreeBSD
-
-Jason Ekstrand (2):
-
-- i965: Emit a NULL surface for buffer textures with no buffer
-- nir/algebraic: Lower fisfinite
-
-Karol Herbst (1):
-
-- spirv: Don't add 0.5 to array indicies for OpImageSampleExplicitLod
-
-Lionel Landwerlin (2):
-
-- isl: only bump the min row pitch for display when not specified
-- anv: fix push constant lowering with bindless shaders
-
-Maniraj D (1):
-
-- egl: set TSD as NULL after deinit
-
-Marcin Ślusarz (2):
-
-- iris: fix scratch address patching for TESS_EVAL stage
-- intel: fix INTEL_DEBUG environment variable on 32-bit systems
-
-Marek Olšák (2):
-
-- mesa: fix crashes in the no_error path of glUniform
-- st/mesa: don't crash when draw indirect buffer has no storage
-
-Mike Blumenkrantz (6):
-
-- aux/pb: add a tolerance for reclaim failure
-- aux/pb: more correctly check number of reclaims
-- zink: fully zero surface creation struct
-- zink: don't break early when applying fb clears
-- zink: fix gl_SampleMaskIn spirv generation
-- nir/lower_samplers_as_deref: rewrite more image intrinsics
-
-Mykhailo Skorokhodov (1):
-
-- iris: Add missed tile flush flag
-
-Nanley Chery (1):
-
-- iris: Tile cache flush for depth before fast clear
-
-Pierre-Eric Pelloux-Prayer (1):
-
-- radeonsi: use viewport offset in quant_mode determination
-
-Tapani Pälli (1):
-
-- anv: use vk_object_zalloc for wsi fences created
-
-Timur Kristóf (1):
-
-- drirc: Apply radv_invariant_geom workaround to Resident Evil Village.

docs/relnotes/21.2.6.rst

@@ -1,161 +0,0 @@
-Mesa 21.2.6 Release Notes / 2021-11-24
-======================================
-
-Mesa 21.2.6 is a bug fix release which fixes bugs found since the 21.2.5 release.
-
-Mesa 21.2.6 implements the OpenGL 4.6 API, but the version reported by
-glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 4.6. OpenGL
-4.6 is **only** available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-
-Mesa 21.2.6 implements the Vulkan 1.2 API, but the version reported by
-the apiVersion property of the VkPhysicalDeviceProperties struct
-depends on the particular driver being used.
-
-SHA256 checksum
----------------
-
-::
-
-    TBD.
-
-
-New features
-------------
-
-- None
-
-
-Bug fixes
----------
-
-- NIR validation failed after nir_copy_prop
-- lima: Corrupted Android-12 UI on Allwinner A64
-- RADV/ACO: Rendering glitches in Forza Horizon 5 windshields
-- dEQP-GLES31.*imulextended* compiling fp64 glsl 4.00 shader
-- Regression/Bisected: Crash in Godot games when steam overlay enabled
-- RADV: IsHelperInvocationEXT query is not considered volatile in ACO
-- Final Fantasy V (Old version): Random text characters are not displayed
-- Diagonal rendering artifacts in Tomb Raider
-- [hsw][bisected][regression] dEQP-VK.reconvergence.*nesting* failures
-
-
-Changes
--------
-
-Connor Abbott (2):
-
-- ir3/lower_pcopy: Fix shr.b illegal copy lowering
-- ir3/lower_pcopy: Fix bug with "illegal" copies and swaps
-
-Danylo Piliaiev (1):
-
-- ir3/ra: Check register file upper bound when updating preferred_reg
-
-Dave Airlie (2):
-
-- llvmpipe: disable 64-bit integer textures.
-- llvmpipe: fix compressed image sizes.
-
-Dylan Baker (9):
-
-- docs: add sha256 sums for 21.2.5
-- .pick_status.json: Update to 8bfa146b8056d5dded6fdd2c4d8524aa0c438058
-- .pick_status.json: Update to 79f57f68930ce4fcf59bdca82357e19b4f3d62e6
-- .pick_status.json: Update to c356f3cfce9459dc1341b6a2a0fd5336a9bdcc3c
-- .pick_status.json: Mark a large number of zink patches as denominated
-- .pick_status.json: Update to 78b613db23c10dc257247d99d8b2b1ef6c96bebb
-- .pick_status.json: Update to 09bb4dbe60b1bb233c5c0102446ffbc142a29246
-- .pick_status.json: Update to e0de7aa4d7717bbd79bbc5bfc660f941f680402b
-- .pick_status.json: Update to f8009d3db25512b5dc62d0272c979fb79f8c7075
-
-Eric Engestrom (1):
-
-- meson: drop duplicate addition of surfaceless & drm to the list of platforms
-
-Greg V (1):
-
-- util: make util_get_process_exec_path work on FreeBSD w/o procfs
-
-Ian Romanick (1):
-
-- glsl/nir: Don't build soft float64 when it cannot be used
-
-Jason Ekstrand (1):
-
-- anv: Fix FlushMappedMemoryRanges for odd mmap offsets
-
-Jesse Natalie (2):
-
-- util/hash_table: Clear special 0/1 entries for u64 hash table too
-- d3d12: Fix Linux fence wait return value
-
-Kenneth Graunke (1):
-
-- iris: Fix MOCS for buffer copies
-
-Lionel Landwerlin (6):
-
-- intel/dev: fix HSW GT3 number of subslices in slice1
-- intel/dev: don't forget to set max_eu_per_subslice in generated topology
-- intel/perf: fix perf equation subslice mask generation for gfx12+
-- intel/devinfo: fix wrong offset computation
-- intel: remove 2 preproduction pci-id for ADLS
-- intel/fs: fix shader call lowering pass
-
-Liviu Prodea (1):
-
-- aco: Work around MSVC restrict in c99_compat.h
-
-Marek Olšák (4):
-
-- radeonsi: print the border color error message only once
-- radeonsi: fix 2 issues with depth_cleared_level_mask
-- radeonsi: fix a typo preventing a fast depth-stencil clear
-- driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors
-
-Mike Blumenkrantz (10):
-
-- zink: add better handling for CUBE_COMPATIBLE bit
-- zink: always use explicit lod for texture() when legal in non-fragment stages
-- zink: be more permissive for injecting LOD into texture() instructions
-- zink: inject LOD for sampler version of OpImageQuerySize
-- zink: don't clamp cube array surfacess to cubes
-- zink: don't clamp 2D_ARRAY surfaces to 2D
-- zink: add more int/float types to cast switching in ntv
-- zink: force float dest types on some alu results
-- aux/primconvert: handle singular incomplete restarts
-- zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb
-
-Pierre-Eric Pelloux-Prayer (3):
-
-- radeonsi: treat nir_intrinsic_load_constant as a VMEM operation
-- ac/surface: don't validate DCC settings if DCC isn't possible
-- mesa: always call _mesa_update_pixel
-
-Rhys Perry (2):
-
-- aco/spill: use spills_entry instead of spills_exit to kill linear VGPRs
-- spirv: run nir_copy_prop before nir_rematerialize_derefs_in_use_blocks_impl
-
-Roman Stratiienko (1):
-
-- android.mk: Add missing variables to the make target
-
-Thomas H.P. Andersen (1):
-
-- svga: fix bitwise/logical and mixup
-
-Timothy Arceri (1):
-
-- mesa: fix buffer overrun in SavedObj texture obj array
-
-Timur Kristóf (1):
-
-- aco: Fix how p_is_helper interacts with optimizations.
-
-Vadym Shovkoplias (1):
-
-- intel/fs: Fix a cmod prop bug when cmod is set to inst that doesn't support it

docs/relnotes/new_features.txt

@@ -0,0 +1,23 @@
+VK_EXT_color_write_enable on lavapipe
+GL_ARB_texture_filter_anisotropic in llvmpipe
+Anisotropic texture filtering in lavapipe
+VK_EXT_shader_atomic_float2 on Intel and RADV.
+VK_EXT_vertex_input_dynamic_state on RADV.
+VK_KHR_timeline_semaphore on lavapipe
+VK_EXT_external_memory_host on lavapipe
+GL_AMD_pinned_memory on llvmpipe
+GL 4.5 compatibility on llvmpipe
+VK_EXT_primitive_topology_list_restart on RADV and lavapipe.
+ES 3.2 on zink
+VK_KHR_depth_stencil_resolve on lavapipe
+VK_KHR_shader_integer_dot_product on RADV.
+OpenGL FP16 support on llvmpipe
+VK_KHR_shader_float16_int8 on lavapipe
+VK_KHR_shader_subgroup_extended_types on lavapipe
+VK_KHR_spirv_1_4 on lavapipe
+Experimental raytracing support on RADV
+VK_KHR_synchronization2 on Intel
+NGG shader based culling is now enabled by default on GFX10.3 on RADV.
+VK_KHR_maintenance4 on RADV
+VK_KHR_format_feature_flags2 on RADV.
+EGL_EXT_present_opaque on wayland

include/EGL/egl.h

@@ -6,34 +6,15 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright 2013-2020 The Khronos Group Inc.
+** SPDX-License-Identifier: Apache-2.0
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-/*
 ** This header is generated from the Khronos EGL XML API Registry.
 ** The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: b5409265f3 $ on $Git commit date: 2020-02-20 08:24:34 -0800 $
+** Khronos $Git commit SHA1: e8baa0bf39 $ on $Git commit date: 2021-04-26 17:56:26 -0600 $
 */
 
 #include <EGL/eglplatform.h>
@@ -42,7 +23,7 @@ extern "C" {
 #define EGL_EGL_PROTOTYPES 1
 #endif
 
-/* Generated on date 20200220 */
+/* Generated on date 20210604 */
 
 /* Generated C header for:
  * API: egl

include/EGL/eglext.h

@@ -6,39 +6,20 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright 2013-2020 The Khronos Group Inc.
+** SPDX-License-Identifier: Apache-2.0
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-/*
 ** This header is generated from the Khronos EGL XML API Registry.
 ** The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: b5409265f3 $ on $Git commit date: 2020-02-20 08:24:34 -0800 $
+** Khronos $Git commit SHA1: dc0b58dca5 $ on $Git commit date: 2021-06-25 01:58:50 +0200 $
 */
 
 #include <EGL/eglplatform.h>
 
-#define EGL_EGLEXT_VERSION 20200220
+#define EGL_EGLEXT_VERSION 20210629
 
 /* Generated C header for:
  * API: egl
@@ -593,6 +574,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu
 #define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1
 #endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */
 
+#ifndef EGL_ANGLE_sync_control_rate
+#define EGL_ANGLE_sync_control_rate 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglGetMscRateANGLE (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator);
+#endif
+#endif /* EGL_ANGLE_sync_control_rate */
+
 #ifndef EGL_ANGLE_window_fixed_size
 #define EGL_ANGLE_window_fixed_size 1
 #define EGL_FIXED_SIZE_ANGLE              0x3201
@@ -662,6 +651,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSwapPolicyEXT (EGLint external_win_id
 #endif
 #endif /* EGL_EXT_compositor */
 
+#ifndef EGL_EXT_config_select_group
+#define EGL_EXT_config_select_group 1
+#define EGL_CONFIG_SELECT_GROUP_EXT       0x34C0
+#endif /* EGL_EXT_config_select_group */
+
 #ifndef EGL_EXT_create_context_robustness
 #define EGL_EXT_create_context_robustness 1
 #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF
@@ -694,6 +688,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #define EGL_DRM_MASTER_FD_EXT             0x333C
 #endif /* EGL_EXT_device_drm */
 
+#ifndef EGL_EXT_device_drm_render_node
+#define EGL_EXT_device_drm_render_node 1
+#define EGL_DRM_RENDER_NODE_FILE_EXT      0x3377
+#endif /* EGL_EXT_device_drm_render_node */
+
 #ifndef EGL_EXT_device_enumeration
 #define EGL_EXT_device_enumeration 1
 #endif /* EGL_EXT_device_enumeration */
@@ -703,10 +702,26 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #define EGL_OPENWF_DEVICE_ID_EXT          0x3237
 #endif /* EGL_EXT_device_openwf */
 
+#ifndef EGL_EXT_device_persistent_id
+#define EGL_EXT_device_persistent_id 1
+#define EGL_DEVICE_UUID_EXT               0x335C
+#define EGL_DRIVER_UUID_EXT               0x335D
+#define EGL_DRIVER_NAME_EXT               0x335E
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEBINARYEXTPROC) (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceBinaryEXT (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size);
+#endif
+#endif /* EGL_EXT_device_persistent_id */
+
 #ifndef EGL_EXT_device_query
 #define EGL_EXT_device_query 1
 #endif /* EGL_EXT_device_query */
 
+#ifndef EGL_EXT_device_query_name
+#define EGL_EXT_device_query_name 1
+#define EGL_RENDERER_EXT                  0x335F
+#endif /* EGL_EXT_device_query_name */
+
 #ifndef EGL_EXT_gl_colorspace_bt2020_linear
 #define EGL_EXT_gl_colorspace_bt2020_linear 1
 #define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F
@@ -883,11 +898,16 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy,
 #define EGL_PLATFORM_X11_SCREEN_EXT       0x31D6
 #endif /* EGL_EXT_platform_x11 */
 
-#ifndef EGL_MESA_platform_xcb
-#define EGL_MESA_platform_xcb 1
+#ifndef EGL_EXT_platform_xcb
+#define EGL_EXT_platform_xcb 1
 #define EGL_PLATFORM_XCB_EXT              0x31DC
 #define EGL_PLATFORM_XCB_SCREEN_EXT       0x31DE
-#endif /* EGL_MESA_platform_xcb */
+#endif /* EGL_EXT_platform_xcb */
+
+#ifndef EGL_EXT_present_opaque
+#define EGL_EXT_present_opaque 1
+#define EGL_PRESENT_OPAQUE_EXT            0x31DF
+#endif /* EGL_EXT_present_opaque */
 
 #ifndef EGL_EXT_protected_content
 #define EGL_EXT_protected_content 1
@@ -1155,6 +1175,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur
 #define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C
 #endif /* EGL_NV_robustness_video_memory_purge */
 
+#ifndef EGL_NV_stream_consumer_eglimage
+#define EGL_NV_stream_consumer_eglimage 1
+#define EGL_STREAM_CONSUMER_IMAGE_NV      0x3373
+#define EGL_STREAM_IMAGE_ADD_NV           0x3374
+#define EGL_STREAM_IMAGE_REMOVE_NV        0x3375
+#define EGL_STREAM_IMAGE_AVAILABLE_NV     0x3376
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMIMAGECONSUMERCONNECTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list);
+typedef EGLint (EGLAPIENTRYP PFNEGLQUERYSTREAMCONSUMEREVENTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMACQUIREIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMRELEASEIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamImageConsumerConnectNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list);
+EGLAPI EGLint EGLAPIENTRY eglQueryStreamConsumerEventNV (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamAcquireImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamReleaseImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync);
+#endif
+#endif /* EGL_NV_stream_consumer_eglimage */
+
 #ifndef EGL_NV_stream_consumer_gltexture_yuv
 #define EGL_NV_stream_consumer_gltexture_yuv 1
 #define EGL_YUV_PLANE0_TEXTURE_UNIT_NV    0x332C

include/GL/gl.h

@@ -38,9 +38,7 @@
 #if defined(__WIN32__) && !defined(__CYGWIN__)
 #  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
+#  else
 #    define GLAPI extern
 #  endif
 #  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */

include/GL/internal/dri_interface.h

@@ -1203,50 +1203,27 @@ struct __DRIdri2LoaderExtensionRec {
 
 #define __DRI_CTX_ATTRIB_MAJOR_VERSION		0
 #define __DRI_CTX_ATTRIB_MINOR_VERSION		1
+
 #define __DRI_CTX_ATTRIB_FLAGS			2
-
-/**
- * \requires __DRI2_ROBUSTNESS.
- */
-#define __DRI_CTX_ATTRIB_RESET_STRATEGY		3
-
 #define __DRI_CTX_FLAG_DEBUG			0x00000001
 #define __DRI_CTX_FLAG_FORWARD_COMPATIBLE	0x00000002
-
-/**
- * \requires __DRI2_ROBUSTNESS.
- */
 #define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS	0x00000004
-
-/**
- * \requires __DRI2_NO_ERROR.
- *
- */
 #define __DRI_CTX_FLAG_NO_ERROR			0x00000008
 
-/**
- * \name Context reset strategies.
- */
-/*@{*/
+#define __DRI_CTX_ATTRIB_RESET_STRATEGY		3
 #define __DRI_CTX_RESET_NO_NOTIFICATION		0
 #define __DRI_CTX_RESET_LOSE_CONTEXT		1
-/*@}*/
 
 #define __DRI_CTX_ATTRIB_PRIORITY		4
-
 #define __DRI_CTX_PRIORITY_LOW			0
 #define __DRI_CTX_PRIORITY_MEDIUM		1
 #define __DRI_CTX_PRIORITY_HIGH			2
 
-/**
- * \name Context release behaviors.
- */
-/*@{*/
 #define __DRI_CTX_ATTRIB_RELEASE_BEHAVIOR	5
-
 #define __DRI_CTX_RELEASE_BEHAVIOR_NONE         0
 #define __DRI_CTX_RELEASE_BEHAVIOR_FLUSH        1
-/*@}*/
+
+#define __DRI_CTX_NUM_ATTRIBS                   6
 
 /**
  * \name Reasons that __DRIdri2Extension::createContextAttribs might fail
@@ -1840,14 +1817,36 @@ struct __DRIimageExtensionRec {
  * with new lookup functions.
  */
 #define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"
-#define __DRI_IMAGE_LOOKUP_VERSION 1
+#define __DRI_IMAGE_LOOKUP_VERSION 2
 
 typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;
 struct __DRIimageLookupExtensionRec {
     __DRIextension base;
 
+    /**
+     * Lookup EGLImage without validated. Equivalent to call
+     * validateEGLImage() then lookupEGLImageValidated().
+     *
+     * \since 1
+     */
     __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,
 				  void *loaderPrivate);
+
+    /**
+     * Check if EGLImage is associated with the EGL display before lookup with
+     * lookupEGLImageValidated(). It will hold EGLDisplay.Mutex, so is separated
+     * out from lookupEGLImage() to avoid deadlock.
+     *
+     * \since 2
+     */
+    GLboolean (*validateEGLImage)(void *image, void *loaderPrivate);
+
+    /**
+     * Lookup EGLImage after validateEGLImage(). No lock in this function.
+     *
+     * \since 2
+     */
+    __DRIimage *(*lookupEGLImageValidated)(void *image, void *loaderPrivate);
 };
 
 /**
@@ -1992,6 +1991,7 @@ typedef struct __DRIDriverVtableExtensionRec {
 #define   __DRI2_RENDERER_HAS_CONTEXT_PRIORITY_HIGH           (1 << 2)
 
 #define __DRI2_RENDERER_HAS_PROTECTED_CONTENT                 0x000e
+#define __DRI2_RENDERER_PREFER_BACK_BUFFER_REUSE              0x000f
 
 typedef struct __DRI2rendererQueryExtensionRec __DRI2rendererQueryExtension;
 struct __DRI2rendererQueryExtensionRec {

include/android_stub/android/hardware_buffer.h

@@ -332,8 +332,6 @@ typedef struct AHardwareBuffer_Planes {
  */
 typedef struct AHardwareBuffer AHardwareBuffer;
 
-#if __ANDROID_API__ >= 26
-
 /**
  * Allocates a buffer that matches the passed AHardwareBuffer_Desc.
  *
@@ -501,10 +499,6 @@ int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int so
  */
 int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** outBuffer) __INTRODUCED_IN(26);
 
-#endif // __ANDROID_API__ >= 26
-
-#if __ANDROID_API__ >= 29
-
 /**
  * Test whether the given format and usage flag combination is
  * allocatable.
@@ -540,7 +534,6 @@ int AHardwareBuffer_isSupported(const AHardwareBuffer_Desc* desc) __INTRODUCED_I
 int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* buffer, uint64_t usage,
         int32_t fence, const ARect* rect, void** outVirtualAddress,
         int32_t* outBytesPerPixel, int32_t* outBytesPerStride) __INTRODUCED_IN(29);
-#endif // __ANDROID_API__ >= 29
 
 __END_DECLS
 

include/android_stub/android/log.h

@@ -217,7 +217,6 @@ typedef void (*__android_logger_function)(const struct __android_log_message* lo
  */
 typedef void (*__android_aborter_function)(const char* abort_message);
 
-#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
 /**
  * Writes the log message specified by log_message.  log_message includes additional file name and
  * line number information that a logger may use.  log_message is versioned for backwards
@@ -371,7 +370,6 @@ int32_t __android_log_get_minimum_priority(void) __INTRODUCED_IN(30);
  * Available since API level 30.
  */
 void __android_log_set_default_tag(const char* tag) __INTRODUCED_IN(30);
-#endif
 
 #ifdef __cplusplus
 }

include/android_stub/android/native_window.h

@@ -185,8 +185,6 @@ int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffe
  */
 int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
 
-#if __ANDROID_API__ >= 26
-
 /**
  * Set a transform that will be applied to future buffers posted to the window.
  *
@@ -197,10 +195,6 @@ int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
  */
 int32_t ANativeWindow_setBuffersTransform(ANativeWindow* window, int32_t transform) __INTRODUCED_IN(26);
 
-#endif // __ANDROID_API__ >= 26
-
-#if __ANDROID_API__ >= 28
-
 /**
  * All buffers queued after this call will be associated with the dataSpace
  * parameter specified.
@@ -229,10 +223,6 @@ int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpa
  */
 int32_t ANativeWindow_getBuffersDataSpace(ANativeWindow* window) __INTRODUCED_IN(28);
 
-#endif // __ANDROID_API__ >= 28
-
-#if __ANDROID_API__ >= 30
-
 /** Compatibility value for ANativeWindow_setFrameRate. */
 enum ANativeWindow_FrameRateCompatibility {
     /**
@@ -301,8 +291,6 @@ int32_t ANativeWindow_setFrameRate(ANativeWindow* window, float frameRate, int8_
  */
 void ANativeWindow_tryAllocateBuffers(ANativeWindow* window);
 
-#endif // __ANDROID_API__ >= 30
-
 #ifdef __cplusplus
 };
 #endif

include/android_stub/apex/window.h

@@ -1,210 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <nativebase/nativebase.h>
-#include <stdarg.h>
-
-// apex is a superset of the NDK
-#include <android/native_window.h>
-
-__BEGIN_DECLS
-
-/*
- * perform bits that can be used with ANativeWindow_perform()
- *
- * This is only to support the intercepting methods below - these should notbe
- * used directly otherwise.
- */
-enum ANativeWindowPerform {
-    // clang-format off
-    ANATIVEWINDOW_PERFORM_SET_USAGE            = 0,
-    ANATIVEWINDOW_PERFORM_SET_BUFFERS_GEOMETRY = 5,
-    ANATIVEWINDOW_PERFORM_SET_BUFFERS_FORMAT   = 9,
-    ANATIVEWINDOW_PERFORM_SET_USAGE64          = 30,
-    // clang-format on
-};
-
-/**
- * Prototype of the function that an ANativeWindow implementation would call
- * when ANativeWindow_cancelBuffer is called.
- */
-typedef int (*ANativeWindow_cancelBufferFn)(ANativeWindow* window, ANativeWindowBuffer* buffer,
-                                            int fenceFd);
-
-/**
- * Prototype of the function that intercepts an invocation of
- * ANativeWindow_cancelBufferFn, along with a data pointer that's passed by the
- * caller who set the interceptor, as well as arguments that would be
- * passed to ANativeWindow_cancelBufferFn if it were to be called.
- */
-typedef int (*ANativeWindow_cancelBufferInterceptor)(ANativeWindow* window,
-                                                     ANativeWindow_cancelBufferFn cancelBuffer,
-                                                     void* data, ANativeWindowBuffer* buffer,
-                                                     int fenceFd);
-
-/**
- * Prototype of the function that an ANativeWindow implementation would call
- * when ANativeWindow_dequeueBuffer is called.
- */
-typedef int (*ANativeWindow_dequeueBufferFn)(ANativeWindow* window, ANativeWindowBuffer** buffer,
-                                             int* fenceFd);
-
-/**
- * Prototype of the function that intercepts an invocation of
- * ANativeWindow_dequeueBufferFn, along with a data pointer that's passed by the
- * caller who set the interceptor, as well as arguments that would be
- * passed to ANativeWindow_dequeueBufferFn if it were to be called.
- */
-typedef int (*ANativeWindow_dequeueBufferInterceptor)(ANativeWindow* window,
-                                                      ANativeWindow_dequeueBufferFn dequeueBuffer,
-                                                      void* data, ANativeWindowBuffer** buffer,
-                                                      int* fenceFd);
-
-/**
- * Prototype of the function that an ANativeWindow implementation would call
- * when ANativeWindow_perform is called.
- */
-typedef int (*ANativeWindow_performFn)(ANativeWindow* window, int operation, va_list args);
-
-/**
- * Prototype of the function that intercepts an invocation of
- * ANativeWindow_performFn, along with a data pointer that's passed by the
- * caller who set the interceptor, as well as arguments that would be
- * passed to ANativeWindow_performFn if it were to be called.
- */
-typedef int (*ANativeWindow_performInterceptor)(ANativeWindow* window,
-                                                ANativeWindow_performFn perform, void* data,
-                                                int operation, va_list args);
-
-/**
- * Prototype of the function that an ANativeWindow implementation would call
- * when ANativeWindow_queueBuffer is called.
- */
-typedef int (*ANativeWindow_queueBufferFn)(ANativeWindow* window, ANativeWindowBuffer* buffer,
-                                           int fenceFd);
-
-/**
- * Prototype of the function that intercepts an invocation of
- * ANativeWindow_queueBufferFn, along with a data pointer that's passed by the
- * caller who set the interceptor, as well as arguments that would be
- * passed to ANativeWindow_queueBufferFn if it were to be called.
- */
-typedef int (*ANativeWindow_queueBufferInterceptor)(ANativeWindow* window,
-                                                    ANativeWindow_queueBufferFn queueBuffer,
-                                                    void* data, ANativeWindowBuffer* buffer,
-                                                    int fenceFd);
-
-/**
- * Registers an interceptor for ANativeWindow_cancelBuffer. Instead of calling
- * the underlying cancelBuffer function, instead the provided interceptor is
- * called, which may optionally call the underlying cancelBuffer function. An
- * optional data pointer is also provided to side-channel additional arguments.
- *
- * Note that usage of this should only be used for specialized use-cases by
- * either the system partition or to Mainline modules. This should never be
- * exposed to NDK or LL-NDK.
- *
- * Returns NO_ERROR on success, -errno if registration failed.
- */
-int ANativeWindow_setCancelBufferInterceptor(ANativeWindow* window,
-                                             ANativeWindow_cancelBufferInterceptor interceptor,
-                                             void* data);
-
-/**
- * Registers an interceptor for ANativeWindow_dequeueBuffer. Instead of calling
- * the underlying dequeueBuffer function, instead the provided interceptor is
- * called, which may optionally call the underlying dequeueBuffer function. An
- * optional data pointer is also provided to side-channel additional arguments.
- *
- * Note that usage of this should only be used for specialized use-cases by
- * either the system partition or to Mainline modules. This should never be
- * exposed to NDK or LL-NDK.
- *
- * Returns NO_ERROR on success, -errno if registration failed.
- */
-int ANativeWindow_setDequeueBufferInterceptor(ANativeWindow* window,
-                                              ANativeWindow_dequeueBufferInterceptor interceptor,
-                                              void* data);
-/**
- * Registers an interceptor for ANativeWindow_perform. Instead of calling
- * the underlying perform function, instead the provided interceptor is
- * called, which may optionally call the underlying perform function. An
- * optional data pointer is also provided to side-channel additional arguments.
- *
- * Note that usage of this should only be used for specialized use-cases by
- * either the system partition or to Mainline modules. This should never be
- * exposed to NDK or LL-NDK.
- *
- * Returns NO_ERROR on success, -errno if registration failed.
- */
-int ANativeWindow_setPerformInterceptor(ANativeWindow* window,
-                                        ANativeWindow_performInterceptor interceptor, void* data);
-/**
- * Registers an interceptor for ANativeWindow_queueBuffer. Instead of calling
- * the underlying queueBuffer function, instead the provided interceptor is
- * called, which may optionally call the underlying queueBuffer function. An
- * optional data pointer is also provided to side-channel additional arguments.
- *
- * Note that usage of this should only be used for specialized use-cases by
- * either the system partition or to Mainline modules. This should never be
- * exposed to NDK or LL-NDK.
- *
- * Returns NO_ERROR on success, -errno if registration failed.
- */
-int ANativeWindow_setQueueBufferInterceptor(ANativeWindow* window,
-                                            ANativeWindow_queueBufferInterceptor interceptor,
-                                            void* data);
-
-/**
- * Retrieves how long it took for the last time a buffer was dequeued.
- *
- * \return the dequeue duration in nanoseconds
- */
-int64_t ANativeWindow_getLastDequeueDuration(ANativeWindow* window);
-
-/**
- * Retrieves how long it took for the last time a buffer was queued.
- *
- * \return the queue duration in nanoseconds
- */
-int64_t ANativeWindow_getLastQueueDuration(ANativeWindow* window);
-
-/**
- * Retrieves the system time in nanoseconds when the last time a buffer
- * started to be dequeued.
- *
- * \return the start time in nanoseconds
- */
-int64_t ANativeWindow_getLastDequeueStartTime(ANativeWindow* window);
-
-/**
- * Sets a timeout in nanoseconds for dequeue calls. All subsequent dequeue calls
- * made by the window will return -ETIMEDOUT after the timeout if the dequeue
- * takes too long.
- *
- * If the provided timeout is negative, hen this removes the previously configured
- * timeout. The window then behaves as if ANativeWindow_setDequeueTimeout was
- * never called.
- *
- * \return NO_ERROR on success
- * \return BAD_VALUE if the dequeue timeout was unabled to be updated, as
- * updating the dequeue timeout may change internals of the underlying window.
- */
-int ANativeWindow_setDequeueTimeout(ANativeWindow* window, int64_t timeout);
-
-__END_DECLS

include/android_stub/cutils/compiler.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_CUTILS_COMPILER_H
+#define ANDROID_CUTILS_COMPILER_H
+
+/*
+ * helps the compiler's optimizer predicting branches
+ */
+
+#ifdef __cplusplus
+#   define CC_LIKELY( exp )    (__builtin_expect( !!(exp), true ))
+#   define CC_UNLIKELY( exp )  (__builtin_expect( !!(exp), false ))
+#else
+#   define CC_LIKELY( exp )    (__builtin_expect( !!(exp), 1 ))
+#   define CC_UNLIKELY( exp )  (__builtin_expect( !!(exp), 0 ))
+#endif
+
+/**
+ * exports marked symbols
+ *
+ * if used on a C++ class declaration, this macro must be inserted
+ * after the "class" keyword. For instance:
+ *
+ * template <typename TYPE>
+ * class ANDROID_API Singleton { }
+ */
+
+#define ANDROID_API __attribute__((visibility("default")))
+
+#endif // ANDROID_CUTILS_COMPILER_H

include/android_stub/cutils/trace.h

@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _LIBS_CUTILS_TRACE_H
+#define _LIBS_CUTILS_TRACE_H
+
+#include <inttypes.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <cutils/compiler.h>
+
+__BEGIN_DECLS
+
+/**
+ * The ATRACE_TAG macro can be defined before including this header to trace
+ * using one of the tags defined below.  It must be defined to one of the
+ * following ATRACE_TAG_* macros.  The trace tag is used to filter tracing in
+ * userland to avoid some of the runtime cost of tracing when it is not desired.
+ *
+ * Defining ATRACE_TAG to be ATRACE_TAG_ALWAYS will result in the tracing always
+ * being enabled - this should ONLY be done for debug code, as userland tracing
+ * has a performance cost even when the trace is not being recorded.  Defining
+ * ATRACE_TAG to be ATRACE_TAG_NEVER or leaving ATRACE_TAG undefined will result
+ * in the tracing always being disabled.
+ *
+ * ATRACE_TAG_HAL should be bitwise ORed with the relevant tags for tracing
+ * within a hardware module.  For example a camera hardware module would set:
+ * #define ATRACE_TAG  (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL)
+ *
+ * Keep these in sync with frameworks/base/core/java/android/os/Trace.java.
+ */
+#define ATRACE_TAG_NEVER            0       // This tag is never enabled.
+#define ATRACE_TAG_ALWAYS           (1<<0)  // This tag is always enabled.
+#define ATRACE_TAG_GRAPHICS         (1<<1)
+#define ATRACE_TAG_INPUT            (1<<2)
+#define ATRACE_TAG_VIEW             (1<<3)
+#define ATRACE_TAG_WEBVIEW          (1<<4)
+#define ATRACE_TAG_WINDOW_MANAGER   (1<<5)
+#define ATRACE_TAG_ACTIVITY_MANAGER (1<<6)
+#define ATRACE_TAG_SYNC_MANAGER     (1<<7)
+#define ATRACE_TAG_AUDIO            (1<<8)
+#define ATRACE_TAG_VIDEO            (1<<9)
+#define ATRACE_TAG_CAMERA           (1<<10)
+#define ATRACE_TAG_HAL              (1<<11)
+#define ATRACE_TAG_APP              (1<<12)
+#define ATRACE_TAG_RESOURCES        (1<<13)
+#define ATRACE_TAG_DALVIK           (1<<14)
+#define ATRACE_TAG_RS               (1<<15)
+#define ATRACE_TAG_BIONIC           (1<<16)
+#define ATRACE_TAG_POWER            (1<<17)
+#define ATRACE_TAG_PACKAGE_MANAGER  (1<<18)
+#define ATRACE_TAG_SYSTEM_SERVER    (1<<19)
+#define ATRACE_TAG_DATABASE         (1<<20)
+#define ATRACE_TAG_NETWORK          (1<<21)
+#define ATRACE_TAG_ADB              (1<<22)
+#define ATRACE_TAG_VIBRATOR         (1<<23)
+#define ATRACE_TAG_AIDL             (1<<24)
+#define ATRACE_TAG_NNAPI            (1<<25)
+#define ATRACE_TAG_RRO              (1<<26)
+#define ATRACE_TAG_LAST             ATRACE_TAG_RRO
+
+// Reserved for initialization.
+#define ATRACE_TAG_NOT_READY        (1ULL<<63)
+
+#define ATRACE_TAG_VALID_MASK ((ATRACE_TAG_LAST - 1) | ATRACE_TAG_LAST)
+
+#ifndef ATRACE_TAG
+#define ATRACE_TAG ATRACE_TAG_NEVER
+#elif ATRACE_TAG > ATRACE_TAG_VALID_MASK
+#error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h
+#endif
+
+/**
+ * Opens the trace file for writing and reads the property for initial tags.
+ * The atrace.tags.enableflags property sets the tags to trace.
+ * This function should not be explicitly called, the first call to any normal
+ * trace function will cause it to be run safely.
+ */
+void atrace_setup();
+
+/**
+ * If tracing is ready, set atrace_enabled_tags to the system property
+ * debug.atrace.tags.enableflags. Can be used as a sysprop change callback.
+ */
+void atrace_update_tags();
+
+/**
+ * Set whether tracing is enabled for the current process.  This is used to
+ * prevent tracing within the Zygote process.
+ */
+void atrace_set_tracing_enabled(bool enabled);
+
+/**
+ * This is always set to false. This forces code that uses an old version
+ * of this header to always call into atrace_setup, in which we call
+ * atrace_init unconditionally.
+ */
+extern atomic_bool atrace_is_ready;
+
+/**
+ * Set of ATRACE_TAG flags to trace for, initialized to ATRACE_TAG_NOT_READY.
+ * A value of zero indicates setup has failed.
+ * Any other nonzero value indicates setup has succeeded, and tracing is on.
+ */
+extern uint64_t atrace_enabled_tags;
+
+/**
+ * Handle to the kernel's trace buffer, initialized to -1.
+ * Any other value indicates setup has succeeded, and is a valid fd for tracing.
+ */
+extern int atrace_marker_fd;
+
+/**
+ * atrace_init readies the process for tracing by opening the trace_marker file.
+ * Calling any trace function causes this to be run, so calling it is optional.
+ * This can be explicitly run to avoid setup delay on first trace function.
+ */
+#define ATRACE_INIT() atrace_init()
+#define ATRACE_GET_ENABLED_TAGS() atrace_get_enabled_tags()
+
+void atrace_init();
+uint64_t atrace_get_enabled_tags();
+
+/**
+ * Test if a given tag is currently enabled.
+ * Returns nonzero if the tag is enabled, otherwise zero.
+ * It can be used as a guard condition around more expensive trace calculations.
+ */
+#define ATRACE_ENABLED() atrace_is_tag_enabled(ATRACE_TAG)
+static inline uint64_t atrace_is_tag_enabled(uint64_t tag)
+{
+    return atrace_get_enabled_tags() & tag;
+}
+
+/**
+ * Trace the beginning of a context.  name is used to identify the context.
+ * This is often used to time function execution.
+ */
+#define ATRACE_BEGIN(name) atrace_begin(ATRACE_TAG, name)
+static inline void atrace_begin(uint64_t tag, const char* name)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_begin_body(const char*);
+        atrace_begin_body(name);
+    }
+}
+
+/**
+ * Trace the end of a context.
+ * This should match up (and occur after) a corresponding ATRACE_BEGIN.
+ */
+#define ATRACE_END() atrace_end(ATRACE_TAG)
+static inline void atrace_end(uint64_t tag)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_end_body();
+        atrace_end_body();
+    }
+}
+
+/**
+ * Trace the beginning of an asynchronous event. Unlike ATRACE_BEGIN/ATRACE_END
+ * contexts, asynchronous events do not need to be nested. The name describes
+ * the event, and the cookie provides a unique identifier for distinguishing
+ * simultaneous events. The name and cookie used to begin an event must be
+ * used to end it.
+ */
+#define ATRACE_ASYNC_BEGIN(name, cookie) \
+    atrace_async_begin(ATRACE_TAG, name, cookie)
+static inline void atrace_async_begin(uint64_t tag, const char* name,
+        int32_t cookie)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_async_begin_body(const char*, int32_t);
+        atrace_async_begin_body(name, cookie);
+    }
+}
+
+/**
+ * Trace the end of an asynchronous event.
+ * This should have a corresponding ATRACE_ASYNC_BEGIN.
+ */
+#define ATRACE_ASYNC_END(name, cookie) atrace_async_end(ATRACE_TAG, name, cookie)
+static inline void atrace_async_end(uint64_t tag, const char* name, int32_t cookie)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_async_end_body(const char*, int32_t);
+        atrace_async_end_body(name, cookie);
+    }
+}
+
+/**
+ * Traces an integer counter value.  name is used to identify the counter.
+ * This can be used to track how a value changes over time.
+ */
+#define ATRACE_INT(name, value) atrace_int(ATRACE_TAG, name, value)
+static inline void atrace_int(uint64_t tag, const char* name, int32_t value)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_int_body(const char*, int32_t);
+        atrace_int_body(name, value);
+    }
+}
+
+/**
+ * Traces a 64-bit integer counter value.  name is used to identify the
+ * counter. This can be used to track how a value changes over time.
+ */
+#define ATRACE_INT64(name, value) atrace_int64(ATRACE_TAG, name, value)
+static inline void atrace_int64(uint64_t tag, const char* name, int64_t value)
+{
+    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
+        void atrace_int64_body(const char*, int64_t);
+        atrace_int64_body(name, value);
+    }
+}
+
+__END_DECLS
+
+#endif // _LIBS_CUTILS_TRACE_H

include/android_stub/log/log_main.h

@@ -364,13 +364,11 @@ int __android_log_is_loggable(int prio, const char* tag, int default_prio);
 int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int default_prio);
 
 #if LOG_NDEBUG /* Production */
-#define android_testLog(prio, tag)                                           \
-  (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \
-                                 ANDROID_LOG_DEBUG) != 0)
+#define android_testLog(prio, tag) \
+  (__android_log_is_loggable_len(prio, tag, (tag) ? strlen(tag) : 0, ANDROID_LOG_DEBUG) != 0)
 #else
-#define android_testLog(prio, tag)                                           \
-  (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \
-                                 ANDROID_LOG_VERBOSE) != 0)
+#define android_testLog(prio, tag) \
+  (__android_log_is_loggable_len(prio, tag, (tag) ? strlen(tag) : 0, ANDROID_LOG_VERBOSE) != 0)
 #endif
 
 #if defined(__clang__)

include/android_stub/ndk/sync.h

@@ -33,8 +33,6 @@
 
 __BEGIN_DECLS
 
-#if __ANDROID_API__ >= 26
-
 /* Fences indicate the status of an asynchronous task. They are initially
  * in unsignaled state (0), and make a one-time transition to either signaled
  * (1) or error (< 0) state. A sync file is a collection of one or more fences;
@@ -101,8 +99,6 @@ static inline struct sync_fence_info* sync_get_fence_info(const struct sync_file
  */
 void sync_file_info_free(struct sync_file_info* info) __INTRODUCED_IN(26);
 
-#endif /* __ANDROID_API__ >= 26 */
-
 __END_DECLS
 
 #endif /* ANDROID_SYNC_H */

include/android_stub/vndk/hardware_buffer.h

@@ -81,6 +81,20 @@ enum {
     AHARDWAREBUFFER_FORMAT_YCbCr_422_I              = 0x14,
 };
 
+/**
+ * Buffer usage flags.
+ */
+enum {
+    /* for future proofing, keep these in sync with hardware/gralloc.h */
+
+    /* The buffer will be written by the HW camera pipeline. */
+    AHARDWAREBUFFER_USAGE_CAMERA_WRITE              = 2UL << 16,
+    /* The buffer will be read by the HW camera pipeline. */
+    AHARDWAREBUFFER_USAGE_CAMERA_READ               = 4UL << 16,
+    /* Mask for the camera access values. */
+    AHARDWAREBUFFER_USAGE_CAMERA_MASK               = 6UL << 16,
+};
+
 __END_DECLS
 
 #endif /* ANDROID_VNDK_NATIVEWINDOW_AHARDWAREBUFFER_H */

include/drm-uapi/drm.h

@@ -629,8 +629,8 @@ struct drm_gem_open {
 /**
  * DRM_CAP_VBLANK_HIGH_CRTC
  *
- * If set to 1, the kernel supports specifying a CRTC index in the high bits of
- * &drm_wait_vblank_request.type.
+ * If set to 1, the kernel supports specifying a :ref:`CRTC index<crtc_index>`
+ * in the high bits of &drm_wait_vblank_request.type.
  *
  * Starting kernel version 2.6.39, this capability is always set to 1.
  */
@@ -1044,6 +1044,16 @@ extern "C" {
 #define DRM_IOCTL_MODE_GETPROPBLOB	DRM_IOWR(0xAC, struct drm_mode_get_blob)
 #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
 #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+/**
+ * DRM_IOCTL_MODE_RMFB - Remove a framebuffer.
+ *
+ * This removes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL
+ * argument is a framebuffer object ID.
+ *
+ * Warning: removing a framebuffer currently in-use on an enabled plane will
+ * disable that plane. The CRTC the plane is linked to may also be disabled
+ * (depending on driver capabilities).
+ */
 #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
 #define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
 #define DRM_IOCTL_MODE_DIRTYFB		DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)

include/drm-uapi/drm_fourcc.h

@@ -900,9 +900,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
 
 /*
  * The top 4 bits (out of the 56 bits alloted for specifying vendor specific
- * modifiers) denote the category for modifiers. Currently we have only two
- * categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen
- * different categories.
+ * modifiers) denote the category for modifiers. Currently we have three
+ * categories of modifiers ie AFBC, MISC and AFRC. We can have a maximum of
+ * sixteen different categories.
  */
 #define DRM_FORMAT_MOD_ARM_CODE(__type, __val) \
 	fourcc_mod_code(ARM, ((__u64)(__type) << 52) | ((__val) & 0x000fffffffffffffULL))
@@ -1017,6 +1017,109 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
  */
 #define AFBC_FORMAT_MOD_USM	(1ULL << 12)
 
+/*
+ * Arm Fixed-Rate Compression (AFRC) modifiers
+ *
+ * AFRC is a proprietary fixed rate image compression protocol and format,
+ * designed to provide guaranteed bandwidth and memory footprint
+ * reductions in graphics and media use-cases.
+ *
+ * AFRC buffers consist of one or more planes, with the same components
+ * and meaning as an uncompressed buffer using the same pixel format.
+ *
+ * Within each plane, the pixel/luma/chroma values are grouped into
+ * "coding unit" blocks which are individually compressed to a
+ * fixed size (in bytes). All coding units within a given plane of a buffer
+ * store the same number of values, and have the same compressed size.
+ *
+ * The coding unit size is configurable, allowing different rates of compression.
+ *
+ * The start of each AFRC buffer plane must be aligned to an alignment granule which
+ * depends on the coding unit size.
+ *
+ * Coding Unit Size   Plane Alignment
+ * ----------------   ---------------
+ * 16 bytes           1024 bytes
+ * 24 bytes           512  bytes
+ * 32 bytes           2048 bytes
+ *
+ * Coding units are grouped into paging tiles. AFRC buffer dimensions must be aligned
+ * to a multiple of the paging tile dimensions.
+ * The dimensions of each paging tile depend on whether the buffer is optimised for
+ * scanline (SCAN layout) or rotated (ROT layout) access.
+ *
+ * Layout   Paging Tile Width   Paging Tile Height
+ * ------   -----------------   ------------------
+ * SCAN     16 coding units     4 coding units
+ * ROT      8  coding units     8 coding units
+ *
+ * The dimensions of each coding unit depend on the number of components
+ * in the compressed plane and whether the buffer is optimised for
+ * scanline (SCAN layout) or rotated (ROT layout) access.
+ *
+ * Number of Components in Plane   Layout      Coding Unit Width   Coding Unit Height
+ * -----------------------------   ---------   -----------------   ------------------
+ * 1                               SCAN        16 samples          4 samples
+ * Example: 16x4 luma samples in a 'Y' plane
+ *          16x4 chroma 'V' values, in the 'V' plane of a fully-planar YUV buffer
+ * -----------------------------   ---------   -----------------   ------------------
+ * 1                               ROT         8 samples           8 samples
+ * Example: 8x8 luma samples in a 'Y' plane
+ *          8x8 chroma 'V' values, in the 'V' plane of a fully-planar YUV buffer
+ * -----------------------------   ---------   -----------------   ------------------
+ * 2                               DONT CARE   8 samples           4 samples
+ * Example: 8x4 chroma pairs in the 'UV' plane of a semi-planar YUV buffer
+ * -----------------------------   ---------   -----------------   ------------------
+ * 3                               DONT CARE   4 samples           4 samples
+ * Example: 4x4 pixels in an RGB buffer without alpha
+ * -----------------------------   ---------   -----------------   ------------------
+ * 4                               DONT CARE   4 samples           4 samples
+ * Example: 4x4 pixels in an RGB buffer with alpha
+ */
+
+#define DRM_FORMAT_MOD_ARM_TYPE_AFRC 0x02
+
+#define DRM_FORMAT_MOD_ARM_AFRC(__afrc_mode) \
+	DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFRC, __afrc_mode)
+
+/*
+ * AFRC coding unit size modifier.
+ *
+ * Indicates the number of bytes used to store each compressed coding unit for
+ * one or more planes in an AFRC encoded buffer. The coding unit size for chrominance
+ * is the same for both Cb and Cr, which may be stored in separate planes.
+ *
+ * AFRC_FORMAT_MOD_CU_SIZE_P0 indicates the number of bytes used to store
+ * each compressed coding unit in the first plane of the buffer. For RGBA buffers
+ * this is the only plane, while for semi-planar and fully-planar YUV buffers,
+ * this corresponds to the luma plane.
+ *
+ * AFRC_FORMAT_MOD_CU_SIZE_P12 indicates the number of bytes used to store
+ * each compressed coding unit in the second and third planes in the buffer.
+ * For semi-planar and fully-planar YUV buffers, this corresponds to the chroma plane(s).
+ *
+ * For single-plane buffers, AFRC_FORMAT_MOD_CU_SIZE_P0 must be specified
+ * and AFRC_FORMAT_MOD_CU_SIZE_P12 must be zero.
+ * For semi-planar and fully-planar buffers, both AFRC_FORMAT_MOD_CU_SIZE_P0 and
+ * AFRC_FORMAT_MOD_CU_SIZE_P12 must be specified.
+ */
+#define AFRC_FORMAT_MOD_CU_SIZE_MASK 0xf
+#define AFRC_FORMAT_MOD_CU_SIZE_16 (1ULL)
+#define AFRC_FORMAT_MOD_CU_SIZE_24 (2ULL)
+#define AFRC_FORMAT_MOD_CU_SIZE_32 (3ULL)
+
+#define AFRC_FORMAT_MOD_CU_SIZE_P0(__afrc_cu_size) (__afrc_cu_size)
+#define AFRC_FORMAT_MOD_CU_SIZE_P12(__afrc_cu_size) ((__afrc_cu_size) << 4)
+
+/*
+ * AFRC scanline memory layout.
+ *
+ * Indicates if the buffer uses the scanline-optimised layout
+ * for an AFRC encoded buffer, otherwise, it uses the rotation-optimised layout.
+ * The memory layout is the same for all planes.
+ */
+#define AFRC_FORMAT_MOD_LAYOUT_SCAN (1ULL << 8)
+
 /*
  * Arm 16x16 Block U-Interleaved modifier
  *

include/drm-uapi/drm_mode.h

@@ -312,16 +312,48 @@ struct drm_mode_set_plane {
 	__u32 src_w;
 };
 
+/**
+ * struct drm_mode_get_plane - Get plane metadata.
+ *
+ * Userspace can perform a GETPLANE ioctl to retrieve information about a
+ * plane.
+ *
+ * To retrieve the number of formats supported, set @count_format_types to zero
+ * and call the ioctl. @count_format_types will be updated with the value.
+ *
+ * To retrieve these formats, allocate an array with the memory needed to store
+ * @count_format_types formats. Point @format_type_ptr to this array and call
+ * the ioctl again (with @count_format_types still set to the value returned in
+ * the first ioctl call).
+ */
 struct drm_mode_get_plane {
+	/**
+	 * @plane_id: Object ID of the plane whose information should be
+	 * retrieved. Set by caller.
+	 */
 	__u32 plane_id;
 
+	/** @crtc_id: Object ID of the current CRTC. */
 	__u32 crtc_id;
+	/** @fb_id: Object ID of the current fb. */
 	__u32 fb_id;
 
+	/**
+	 * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's
+	 * are created and they receive an index, which corresponds to their
+	 * position in the bitmask. Bit N corresponds to
+	 * :ref:`CRTC index<crtc_index>` N.
+	 */
 	__u32 possible_crtcs;
+	/** @gamma_size: Never used. */
 	__u32 gamma_size;
 
+	/** @count_format_types: Number of formats. */
 	__u32 count_format_types;
+	/**
+	 * @format_type_ptr: Pointer to ``__u32`` array of formats that are
+	 * supported by the plane. These formats do not require modifiers.
+	 */
 	__u64 format_type_ptr;
 };
 
@@ -509,22 +541,74 @@ struct drm_mode_get_connector {
  */
 #define DRM_MODE_PROP_ATOMIC        0x80000000
 
+/**
+ * struct drm_mode_property_enum - Description for an enum/bitfield entry.
+ * @value: numeric value for this enum entry.
+ * @name: symbolic name for this enum entry.
+ *
+ * See struct drm_property_enum for details.
+ */
 struct drm_mode_property_enum {
 	__u64 value;
 	char name[DRM_PROP_NAME_LEN];
 };
 
+/**
+ * struct drm_mode_get_property - Get property metadata.
+ *
+ * User-space can perform a GETPROPERTY ioctl to retrieve information about a
+ * property. The same property may be attached to multiple objects, see
+ * "Modeset Base Object Abstraction".
+ *
+ * The meaning of the @values_ptr field changes depending on the property type.
+ * See &drm_property.flags for more details.
+ *
+ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the
+ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For
+ * backwards compatibility, the kernel will always set @count_enum_blobs to
+ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must
+ * ignore these two fields if the property has a different type.
+ *
+ * User-space is expected to retrieve values and enums by performing this ioctl
+ * at least twice: the first time to retrieve the number of elements, the
+ * second time to retrieve the elements themselves.
+ *
+ * To retrieve the number of elements, set @count_values and @count_enum_blobs
+ * to zero, then call the ioctl. @count_values will be updated with the number
+ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or
+ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well.
+ *
+ * To retrieve the elements themselves, allocate an array for @values_ptr and
+ * set @count_values to its capacity. If the property has the type
+ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for
+ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl
+ * again will fill the arrays.
+ */
 struct drm_mode_get_property {
-	__u64 values_ptr; /* values and blob lengths */
-	__u64 enum_blob_ptr; /* enum and blob id ptrs */
+	/** @values_ptr: Pointer to a ``__u64`` array. */
+	__u64 values_ptr;
+	/** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */
+	__u64 enum_blob_ptr;
 
+	/**
+	 * @prop_id: Object ID of the property which should be retrieved. Set
+	 * by the caller.
+	 */
 	__u32 prop_id;
+	/**
+	 * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for
+	 * a definition of the flags.
+	 */
 	__u32 flags;
+	/**
+	 * @name: Symbolic property name. User-space should use this field to
+	 * recognize properties.
+	 */
 	char name[DRM_PROP_NAME_LEN];
 
+	/** @count_values: Number of elements in @values_ptr. */
 	__u32 count_values;
-	/* This is only used to count enum values, not blobs. The _blobs is
-	 * simply because of a historical reason, i.e. backwards compat. */
+	/** @count_enum_blobs: Number of elements in @enum_blob_ptr. */
 	__u32 count_enum_blobs;
 };
 

include/drm-uapi/i915_drm.h

@@ -572,6 +572,15 @@ typedef struct drm_i915_irq_wait {
 #define   I915_SCHEDULER_CAP_PREEMPTION	(1ul << 2)
 #define   I915_SCHEDULER_CAP_SEMAPHORES	(1ul << 3)
 #define   I915_SCHEDULER_CAP_ENGINE_BUSY_STATS	(1ul << 4)
+/*
+ * Indicates the 2k user priority levels are statically mapped into 3 buckets as
+ * follows:
+ *
+ * -1k to -1	Low priority
+ * 0		Normal priority
+ * 1 to 1k	Highest priority
+ */
+#define   I915_SCHEDULER_CAP_STATIC_PRIORITY_MAP	(1ul << 5)
 
 #define I915_PARAM_HUC_STATUS		 42
 
@@ -674,6 +683,9 @@ typedef struct drm_i915_irq_wait {
  */
 #define I915_PARAM_HAS_EXEC_TIMELINE_FENCES 55
 
+/* Query if the kernel supports the I915_USERPTR_PROBE flag. */
+#define I915_PARAM_HAS_USERPTR_PROBE 56
+
 /* Must be kept compact -- no holes and well documented */
 
 typedef struct drm_i915_getparam {
@@ -849,45 +861,113 @@ struct drm_i915_gem_mmap_gtt {
 	__u64 offset;
 };
 
+/**
+ * struct drm_i915_gem_mmap_offset - Retrieve an offset so we can mmap this buffer object.
+ *
+ * This struct is passed as argument to the `DRM_IOCTL_I915_GEM_MMAP_OFFSET` ioctl,
+ * and is used to retrieve the fake offset to mmap an object specified by &handle.
+ *
+ * The legacy way of using `DRM_IOCTL_I915_GEM_MMAP` is removed on gen12+.
+ * `DRM_IOCTL_I915_GEM_MMAP_GTT` is an older supported alias to this struct, but will behave
+ * as setting the &extensions to 0, and &flags to `I915_MMAP_OFFSET_GTT`.
+ */
 struct drm_i915_gem_mmap_offset {
-	/** Handle for the object being mapped. */
+	/** @handle: Handle for the object being mapped. */
 	__u32 handle;
+	/** @pad: Must be zero */
 	__u32 pad;
 	/**
-	 * Fake offset to use for subsequent mmap call
+	 * @offset: The fake offset to use for subsequent mmap call
 	 *
 	 * This is a fixed-size type for 32/64 compatibility.
 	 */
 	__u64 offset;
 
 	/**
-	 * Flags for extended behaviour.
+	 * @flags: Flags for extended behaviour.
 	 *
-	 * It is mandatory that one of the MMAP_OFFSET types
-	 * (GTT, WC, WB, UC, etc) should be included.
+	 * It is mandatory that one of the `MMAP_OFFSET` types
+	 * should be included:
+	 *
+	 * - `I915_MMAP_OFFSET_GTT`: Use mmap with the object bound to GTT. (Write-Combined)
+	 * - `I915_MMAP_OFFSET_WC`: Use Write-Combined caching.
+	 * - `I915_MMAP_OFFSET_WB`: Use Write-Back caching.
+	 * - `I915_MMAP_OFFSET_FIXED`: Use object placement to determine caching.
+	 *
+	 * On devices with local memory `I915_MMAP_OFFSET_FIXED` is the only valid
+	 * type. On devices without local memory, this caching mode is invalid.
+	 *
+	 * As caching mode when specifying `I915_MMAP_OFFSET_FIXED`, WC or WB will
+	 * be used, depending on the object placement on creation. WB will be used
+	 * when the object can only exist in system memory, WC otherwise.
 	 */
 	__u64 flags;
-#define I915_MMAP_OFFSET_GTT 0
-#define I915_MMAP_OFFSET_WC  1
-#define I915_MMAP_OFFSET_WB  2
-#define I915_MMAP_OFFSET_UC  3
 
-	/*
-	 * Zero-terminated chain of extensions.
+#define I915_MMAP_OFFSET_GTT	0
+#define I915_MMAP_OFFSET_WC	1
+#define I915_MMAP_OFFSET_WB	2
+#define I915_MMAP_OFFSET_UC	3
+#define I915_MMAP_OFFSET_FIXED	4
+
+	/**
+	 * @extensions: Zero-terminated chain of extensions.
 	 *
 	 * No current extensions defined; mbz.
 	 */
 	__u64 extensions;
 };
 
+/**
+ * struct drm_i915_gem_set_domain - Adjust the objects write or read domain, in
+ * preparation for accessing the pages via some CPU domain.
+ *
+ * Specifying a new write or read domain will flush the object out of the
+ * previous domain(if required), before then updating the objects domain
+ * tracking with the new domain.
+ *
+ * Note this might involve waiting for the object first if it is still active on
+ * the GPU.
+ *
+ * Supported values for @read_domains and @write_domain:
+ *
+ *	- I915_GEM_DOMAIN_WC: Uncached write-combined domain
+ *	- I915_GEM_DOMAIN_CPU: CPU cache domain
+ *	- I915_GEM_DOMAIN_GTT: Mappable aperture domain
+ *
+ * All other domains are rejected.
+ *
+ * Note that for discrete, starting from DG1, this is no longer supported, and
+ * is instead rejected. On such platforms the CPU domain is effectively static,
+ * where we also only support a single &drm_i915_gem_mmap_offset cache mode,
+ * which can't be set explicitly and instead depends on the object placements,
+ * as per the below.
+ *
+ * Implicit caching rules, starting from DG1:
+ *
+ *	- If any of the object placements (see &drm_i915_gem_create_ext_memory_regions)
+ *	  contain I915_MEMORY_CLASS_DEVICE then the object will be allocated and
+ *	  mapped as write-combined only.
+ *
+ *	- Everything else is always allocated and mapped as write-back, with the
+ *	  guarantee that everything is also coherent with the GPU.
+ *
+ * Note that this is likely to change in the future again, where we might need
+ * more flexibility on future devices, so making this all explicit as part of a
+ * new &drm_i915_gem_create_ext extension is probable.
+ */
 struct drm_i915_gem_set_domain {
-	/** Handle for the object */
+	/** @handle: Handle for the object. */
 	__u32 handle;
 
-	/** New read domains */
+	/** @read_domains: New read domains. */
 	__u32 read_domains;
 
-	/** New write domain */
+	/**
+	 * @write_domain: New write domain.
+	 *
+	 * Note that having something in the write domain implies it's in the
+	 * read domain, and only that read domain.
+	 */
 	__u32 write_domain;
 };
 
@@ -1348,12 +1428,11 @@ struct drm_i915_gem_busy {
 	 * reading from the object simultaneously.
 	 *
 	 * The value of each engine class is the same as specified in the
-	 * I915_CONTEXT_SET_ENGINES parameter and via perf, i.e.
+	 * I915_CONTEXT_PARAM_ENGINES context parameter and via perf, i.e.
 	 * I915_ENGINE_CLASS_RENDER, I915_ENGINE_CLASS_COPY, etc.
-	 * reported as active itself. Some hardware may have parallel
-	 * execution engines, e.g. multiple media engines, which are
-	 * mapped to the same class identifier and so are not separately
-	 * reported for busyness.
+	 * Some hardware may have parallel execution engines, e.g. multiple
+	 * media engines, which are mapped to the same class identifier and so
+	 * are not separately reported for busyness.
 	 *
 	 * Caveat emptor:
 	 * Only the boolean result of this query is reliable; that is whether
@@ -1364,43 +1443,79 @@ struct drm_i915_gem_busy {
 };
 
 /**
- * I915_CACHING_NONE
+ * struct drm_i915_gem_caching - Set or get the caching for given object
+ * handle.
  *
- * GPU access is not coherent with cpu caches. Default for machines without an
- * LLC.
- */
-#define I915_CACHING_NONE		0
-/**
- * I915_CACHING_CACHED
+ * Allow userspace to control the GTT caching bits for a given object when the
+ * object is later mapped through the ppGTT(or GGTT on older platforms lacking
+ * ppGTT support, or if the object is used for scanout). Note that this might
+ * require unbinding the object from the GTT first, if its current caching value
+ * doesn't match.
  *
- * GPU access is coherent with cpu caches and furthermore the data is cached in
- * last-level caches shared between cpu cores and the gpu GT. Default on
- * machines with HAS_LLC.
- */
-#define I915_CACHING_CACHED		1
-/**
- * I915_CACHING_DISPLAY
+ * Note that this all changes on discrete platforms, starting from DG1, the
+ * set/get caching is no longer supported, and is now rejected.  Instead the CPU
+ * caching attributes(WB vs WC) will become an immutable creation time property
+ * for the object, along with the GTT caching level. For now we don't expose any
+ * new uAPI for this, instead on DG1 this is all implicit, although this largely
+ * shouldn't matter since DG1 is coherent by default(without any way of
+ * controlling it).
  *
- * Special GPU caching mode which is coherent with the scanout engines.
- * Transparently falls back to I915_CACHING_NONE on platforms where no special
- * cache mode (like write-through or gfdt flushing) is available. The kernel
- * automatically sets this mode when using a buffer as a scanout target.
- * Userspace can manually set this mode to avoid a costly stall and clflush in
- * the hotpath of drawing the first frame.
+ * Implicit caching rules, starting from DG1:
+ *
+ *     - If any of the object placements (see &drm_i915_gem_create_ext_memory_regions)
+ *       contain I915_MEMORY_CLASS_DEVICE then the object will be allocated and
+ *       mapped as write-combined only.
+ *
+ *     - Everything else is always allocated and mapped as write-back, with the
+ *       guarantee that everything is also coherent with the GPU.
+ *
+ * Note that this is likely to change in the future again, where we might need
+ * more flexibility on future devices, so making this all explicit as part of a
+ * new &drm_i915_gem_create_ext extension is probable.
+ *
+ * Side note: Part of the reason for this is that changing the at-allocation-time CPU
+ * caching attributes for the pages might be required(and is expensive) if we
+ * need to then CPU map the pages later with different caching attributes. This
+ * inconsistent caching behaviour, while supported on x86, is not universally
+ * supported on other architectures. So for simplicity we opt for setting
+ * everything at creation time, whilst also making it immutable, on discrete
+ * platforms.
  */
-#define I915_CACHING_DISPLAY		2
-
 struct drm_i915_gem_caching {
 	/**
-	 * Handle of the buffer to set/get the caching level of. */
+	 * @handle: Handle of the buffer to set/get the caching level.
+	 */
 	__u32 handle;
 
 	/**
-	 * Cacheing level to apply or return value
+	 * @caching: The GTT caching level to apply or possible return value.
 	 *
-	 * bits0-15 are for generic caching control (i.e. the above defined
-	 * values). bits16-31 are reserved for platform-specific variations
-	 * (e.g. l3$ caching on gen7). */
+	 * The supported @caching values:
+	 *
+	 * I915_CACHING_NONE:
+	 *
+	 * GPU access is not coherent with CPU caches.  Default for machines
+	 * without an LLC. This means manual flushing might be needed, if we
+	 * want GPU access to be coherent.
+	 *
+	 * I915_CACHING_CACHED:
+	 *
+	 * GPU access is coherent with CPU caches and furthermore the data is
+	 * cached in last-level caches shared between CPU cores and the GPU GT.
+	 *
+	 * I915_CACHING_DISPLAY:
+	 *
+	 * Special GPU caching mode which is coherent with the scanout engines.
+	 * Transparently falls back to I915_CACHING_NONE on platforms where no
+	 * special cache mode (like write-through or gfdt flushing) is
+	 * available. The kernel automatically sets this mode when using a
+	 * buffer as a scanout target.  Userspace can manually set this mode to
+	 * avoid a costly stall and clflush in the hotpath of drawing the first
+	 * frame.
+	 */
+#define I915_CACHING_NONE		0
+#define I915_CACHING_CACHED		1
+#define I915_CACHING_DISPLAY		2
 	__u32 caching;
 };
 
@@ -1639,6 +1754,10 @@ struct drm_i915_gem_context_param {
 	__u32 size;
 	__u64 param;
 #define I915_CONTEXT_PARAM_BAN_PERIOD	0x1
+/* I915_CONTEXT_PARAM_NO_ZEROMAP has been removed.  On the off chance
+ * someone somewhere has attempted to use it, never re-use this context
+ * param number.
+ */
 #define I915_CONTEXT_PARAM_NO_ZEROMAP	0x2
 #define I915_CONTEXT_PARAM_GTT_SIZE	0x3
 #define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE	0x4
@@ -1723,24 +1842,8 @@ struct drm_i915_gem_context_param {
  */
 #define I915_CONTEXT_PARAM_PERSISTENCE	0xb
 
-/*
- * I915_CONTEXT_PARAM_RINGSIZE:
- *
- * Sets the size of the CS ringbuffer to use for logical ring contexts. This
- * applies a limit of how many batches can be queued to HW before the caller
- * is blocked due to lack of space for more commands.
- *
- * Only reliably possible to be set prior to first use, i.e. during
- * construction. At any later point, the current execution must be flushed as
- * the ring can only be changed while the context is idle. Note, the ringsize
- * can be specified as a constructor property, see
- * I915_CONTEXT_CREATE_EXT_SETPARAM, but can also be set later if required.
- *
- * Only applies to the current set of engine and lost when those engines
- * are replaced by a new mapping (see I915_CONTEXT_PARAM_ENGINES).
- *
- * Must be between 4 - 512 KiB, in intervals of page size [4 KiB].
- * Default is 16 KiB.
+/* This API has been removed.  On the off chance someone somewhere has
+ * attempted to use it, never re-use this context param number.
  */
 #define I915_CONTEXT_PARAM_RINGSIZE	0xc
 /* Must be kept compact -- no holes and well documented */
@@ -1807,6 +1910,69 @@ struct drm_i915_gem_context_param_sseu {
 	__u32 rsvd;
 };
 
+/**
+ * DOC: Virtual Engine uAPI
+ *
+ * Virtual engine is a concept where userspace is able to configure a set of
+ * physical engines, submit a batch buffer, and let the driver execute it on any
+ * engine from the set as it sees fit.
+ *
+ * This is primarily useful on parts which have multiple instances of a same
+ * class engine, like for example GT3+ Skylake parts with their two VCS engines.
+ *
+ * For instance userspace can enumerate all engines of a certain class using the
+ * previously described `Engine Discovery uAPI`_. After that userspace can
+ * create a GEM context with a placeholder slot for the virtual engine (using
+ * `I915_ENGINE_CLASS_INVALID` and `I915_ENGINE_CLASS_INVALID_NONE` for class
+ * and instance respectively) and finally using the
+ * `I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE` extension place a virtual engine in
+ * the same reserved slot.
+ *
+ * Example of creating a virtual engine and submitting a batch buffer to it:
+ *
+ * .. code-block:: C
+ *
+ * 	I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(virtual, 2) = {
+ * 		.base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE,
+ * 		.engine_index = 0, // Place this virtual engine into engine map slot 0
+ * 		.num_siblings = 2,
+ * 		.engines = { { I915_ENGINE_CLASS_VIDEO, 0 },
+ * 			     { I915_ENGINE_CLASS_VIDEO, 1 }, },
+ * 	};
+ * 	I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 1) = {
+ * 		.engines = { { I915_ENGINE_CLASS_INVALID,
+ * 			       I915_ENGINE_CLASS_INVALID_NONE } },
+ * 		.extensions = to_user_pointer(&virtual), // Chains after load_balance extension
+ * 	};
+ * 	struct drm_i915_gem_context_create_ext_setparam p_engines = {
+ * 		.base = {
+ * 			.name = I915_CONTEXT_CREATE_EXT_SETPARAM,
+ * 		},
+ * 		.param = {
+ * 			.param = I915_CONTEXT_PARAM_ENGINES,
+ * 			.value = to_user_pointer(&engines),
+ * 			.size = sizeof(engines),
+ * 		},
+ * 	};
+ * 	struct drm_i915_gem_context_create_ext create = {
+ * 		.flags = I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS,
+ * 		.extensions = to_user_pointer(&p_engines);
+ * 	};
+ *
+ * 	ctx_id = gem_context_create_ext(drm_fd, &create);
+ *
+ * 	// Now we have created a GEM context with its engine map containing a
+ * 	// single virtual engine. Submissions to this slot can go either to
+ * 	// vcs0 or vcs1, depending on the load balancing algorithm used inside
+ * 	// the driver. The load balancing is dynamic from one batch buffer to
+ * 	// another and transparent to userspace.
+ *
+ * 	...
+ * 	execbuf.rsvd1 = ctx_id;
+ * 	execbuf.flags = 0; // Submits to index 0 which is the virtual engine
+ * 	gem_execbuf(drm_fd, &execbuf);
+ */
+
 /*
  * i915_context_engines_load_balance:
  *
@@ -1883,6 +2049,61 @@ struct i915_context_engines_bond {
 	struct i915_engine_class_instance engines[N__]; \
 } __attribute__((packed)) name__
 
+/**
+ * DOC: Context Engine Map uAPI
+ *
+ * Context engine map is a new way of addressing engines when submitting batch-
+ * buffers, replacing the existing way of using identifiers like `I915_EXEC_BLT`
+ * inside the flags field of `struct drm_i915_gem_execbuffer2`.
+ *
+ * To use it created GEM contexts need to be configured with a list of engines
+ * the user is intending to submit to. This is accomplished using the
+ * `I915_CONTEXT_PARAM_ENGINES` parameter and `struct
+ * i915_context_param_engines`.
+ *
+ * For such contexts the `I915_EXEC_RING_MASK` field becomes an index into the
+ * configured map.
+ *
+ * Example of creating such context and submitting against it:
+ *
+ * .. code-block:: C
+ *
+ * 	I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 2) = {
+ * 		.engines = { { I915_ENGINE_CLASS_RENDER, 0 },
+ * 			     { I915_ENGINE_CLASS_COPY, 0 } }
+ * 	};
+ * 	struct drm_i915_gem_context_create_ext_setparam p_engines = {
+ * 		.base = {
+ * 			.name = I915_CONTEXT_CREATE_EXT_SETPARAM,
+ * 		},
+ * 		.param = {
+ * 			.param = I915_CONTEXT_PARAM_ENGINES,
+ * 			.value = to_user_pointer(&engines),
+ * 			.size = sizeof(engines),
+ * 		},
+ * 	};
+ * 	struct drm_i915_gem_context_create_ext create = {
+ * 		.flags = I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS,
+ * 		.extensions = to_user_pointer(&p_engines);
+ * 	};
+ *
+ * 	ctx_id = gem_context_create_ext(drm_fd, &create);
+ *
+ * 	// We have now created a GEM context with two engines in the map:
+ * 	// Index 0 points to rcs0 while index 1 points to bcs0. Other engines
+ * 	// will not be accessible from this context.
+ *
+ * 	...
+ * 	execbuf.rsvd1 = ctx_id;
+ * 	execbuf.flags = 0; // Submits to index 0, which is rcs0 for this context
+ * 	gem_execbuf(drm_fd, &execbuf);
+ *
+ * 	...
+ * 	execbuf.rsvd1 = ctx_id;
+ * 	execbuf.flags = 1; // Submits to index 0, which is bcs0 for this context
+ * 	gem_execbuf(drm_fd, &execbuf);
+ */
+
 struct i915_context_param_engines {
 	__u64 extensions; /* linked chain of extension blocks, 0 terminates */
 #define I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE 0 /* see i915_context_engines_load_balance */
@@ -1901,20 +2122,10 @@ struct drm_i915_gem_context_create_ext_setparam {
 	struct drm_i915_gem_context_param param;
 };
 
-struct drm_i915_gem_context_create_ext_clone {
+/* This API has been removed.  On the off chance someone somewhere has
+ * attempted to use it, never re-use this extension number.
+ */
 #define I915_CONTEXT_CREATE_EXT_CLONE 1
-	struct i915_user_extension base;
-	__u32 clone_id;
-	__u32 flags;
-#define I915_CONTEXT_CLONE_ENGINES	(1u << 0)
-#define I915_CONTEXT_CLONE_FLAGS	(1u << 1)
-#define I915_CONTEXT_CLONE_SCHEDATTR	(1u << 2)
-#define I915_CONTEXT_CLONE_SSEU		(1u << 3)
-#define I915_CONTEXT_CLONE_TIMELINE	(1u << 4)
-#define I915_CONTEXT_CLONE_VM		(1u << 5)
-#define I915_CONTEXT_CLONE_UNKNOWN -(I915_CONTEXT_CLONE_VM << 1)
-	__u64 rsvd;
-};
 
 struct drm_i915_gem_context_destroy {
 	__u32 ctx_id;
@@ -1986,14 +2197,69 @@ struct drm_i915_reset_stats {
 	__u32 pad;
 };
 
+/**
+ * struct drm_i915_gem_userptr - Create GEM object from user allocated memory.
+ *
+ * Userptr objects have several restrictions on what ioctls can be used with the
+ * object handle.
+ */
 struct drm_i915_gem_userptr {
+	/**
+	 * @user_ptr: The pointer to the allocated memory.
+	 *
+	 * Needs to be aligned to PAGE_SIZE.
+	 */
 	__u64 user_ptr;
+
+	/**
+	 * @user_size:
+	 *
+	 * The size in bytes for the allocated memory. This will also become the
+	 * object size.
+	 *
+	 * Needs to be aligned to PAGE_SIZE, and should be at least PAGE_SIZE,
+	 * or larger.
+	 */
 	__u64 user_size;
+
+	/**
+	 * @flags:
+	 *
+	 * Supported flags:
+	 *
+	 * I915_USERPTR_READ_ONLY:
+	 *
+	 * Mark the object as readonly, this also means GPU access can only be
+	 * readonly. This is only supported on HW which supports readonly access
+	 * through the GTT. If the HW can't support readonly access, an error is
+	 * returned.
+	 *
+	 * I915_USERPTR_PROBE:
+	 *
+	 * Probe the provided @user_ptr range and validate that the @user_ptr is
+	 * indeed pointing to normal memory and that the range is also valid.
+	 * For example if some garbage address is given to the kernel, then this
+	 * should complain.
+	 *
+	 * Returns -EFAULT if the probe failed.
+	 *
+	 * Note that this doesn't populate the backing pages, and also doesn't
+	 * guarantee that the object will remain valid when the object is
+	 * eventually used.
+	 *
+	 * The kernel supports this feature if I915_PARAM_HAS_USERPTR_PROBE
+	 * returns a non-zero value.
+	 *
+	 * I915_USERPTR_UNSYNCHRONIZED:
+	 *
+	 * NOT USED. Setting this flag will result in an error.
+	 */
 	__u32 flags;
 #define I915_USERPTR_READ_ONLY 0x1
+#define I915_USERPTR_PROBE 0x2
 #define I915_USERPTR_UNSYNCHRONIZED 0x80000000
 	/**
-	 * Returned handle for the object.
+	 * @handle: Returned handle for the object.
 	 *
 	 * Object handles are nonzero.
 	 */
@@ -2376,6 +2642,76 @@ struct drm_i915_query_topology_info {
 	__u8 data[];
 };
 
+/**
+ * DOC: Engine Discovery uAPI
+ *
+ * Engine discovery uAPI is a way of enumerating physical engines present in a
+ * GPU associated with an open i915 DRM file descriptor. This supersedes the old
+ * way of using `DRM_IOCTL_I915_GETPARAM` and engine identifiers like
+ * `I915_PARAM_HAS_BLT`.
+ *
+ * The need for this interface came starting with Icelake and newer GPUs, which
+ * started to establish a pattern of having multiple engines of a same class,
+ * where not all instances were always completely functionally equivalent.
+ *
+ * Entry point for this uapi is `DRM_IOCTL_I915_QUERY` with the
+ * `DRM_I915_QUERY_ENGINE_INFO` as the queried item id.
+ *
+ * Example for getting the list of engines:
+ *
+ * .. code-block:: C
+ *
+ * 	struct drm_i915_query_engine_info *info;
+ * 	struct drm_i915_query_item item = {
+ * 		.query_id = DRM_I915_QUERY_ENGINE_INFO;
+ * 	};
+ * 	struct drm_i915_query query = {
+ * 		.num_items = 1,
+ * 		.items_ptr = (uintptr_t)&item,
+ * 	};
+ * 	int err, i;
+ *
+ * 	// First query the size of the blob we need, this needs to be large
+ * 	// enough to hold our array of engines. The kernel will fill out the
+ * 	// item.length for us, which is the number of bytes we need.
+ * 	//
+ * 	// Alternatively a large buffer can be allocated straight away enabling
+ * 	// querying in one pass, in which case item.length should contain the
+ * 	// length of the provided buffer.
+ * 	err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
+ * 	if (err) ...
+ *
+ * 	info = calloc(1, item.length);
+ * 	// Now that we allocated the required number of bytes, we call the ioctl
+ * 	// again, this time with the data_ptr pointing to our newly allocated
+ * 	// blob, which the kernel can then populate with info on all engines.
+ * 	item.data_ptr = (uintptr_t)&info,
+ *
+ * 	err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
+ * 	if (err) ...
+ *
+ * 	// We can now access each engine in the array
+ * 	for (i = 0; i < info->num_engines; i++) {
+ * 		struct drm_i915_engine_info einfo = info->engines[i];
+ * 		u16 class = einfo.engine.class;
+ * 		u16 instance = einfo.engine.instance;
+ * 		....
+ * 	}
+ *
+ * 	free(info);
+ *
+ * Each of the enumerated engines, apart from being defined by its class and
+ * instance (see `struct i915_engine_class_instance`), also can have flags and
+ * capabilities defined as documented in i915_drm.h.
+ *
+ * For instance video engines which support HEVC encoding will have the
+ * `I915_VIDEO_CLASS_CAPABILITY_HEVC` capability bit set.
+ *
+ * Engine discovery only fully comes to its own when combined with the new way
+ * of addressing engines when submitting batch buffers using contexts with
+ * engine maps configured.
+ */
+
 /**
  * struct drm_i915_engine_info
  *

include/drm-uapi/msm_drm.h

@@ -73,11 +73,19 @@ struct drm_msm_timespec {
 #define MSM_PARAM_MAX_FREQ   0x04
 #define MSM_PARAM_TIMESTAMP  0x05
 #define MSM_PARAM_GMEM_BASE  0x06
-#define MSM_PARAM_NR_RINGS   0x07
+#define MSM_PARAM_PRIORITIES 0x07  /* The # of priority levels */
 #define MSM_PARAM_PP_PGTABLE 0x08  /* => 1 for per-process pagetables, else 0 */
 #define MSM_PARAM_FAULTS     0x09
 #define MSM_PARAM_SUSPENDS   0x0a
 
+/* For backwards compat.  The original support for preemption was based on
+ * a single ring per priority level so # of priority levels equals the #
+ * of rings.  With drm/scheduler providing additional levels of priority,
+ * the number of priorities is greater than the # of rings.  The param is
+ * renamed to better reflect this.
+ */
+#define MSM_PARAM_NR_RINGS   MSM_PARAM_PRIORITIES
+
 struct drm_msm_param {
 	__u32 pipe;           /* in, MSM_PIPE_x */
 	__u32 param;          /* in, MSM_PARAM_x */
@@ -94,13 +102,12 @@ struct drm_msm_param {
 /* cache modes */
 #define MSM_BO_CACHED        0x00010000
 #define MSM_BO_WC            0x00020000
-#define MSM_BO_UNCACHED      0x00040000
+#define MSM_BO_UNCACHED      0x00040000 /* deprecated, use MSM_BO_WC */
+#define MSM_BO_CACHED_COHERENT 0x080000
 
 #define MSM_BO_FLAGS         (MSM_BO_SCANOUT | \
                               MSM_BO_GPU_READONLY | \
-                              MSM_BO_CACHED | \
-                              MSM_BO_WC | \
-                              MSM_BO_UNCACHED)
+                              MSM_BO_CACHE_MASK)
 
 struct drm_msm_gem_new {
 	__u64 size;           /* in */
@@ -305,6 +312,10 @@ struct drm_msm_gem_madvise {
 
 #define MSM_SUBMITQUEUE_FLAGS (0)
 
+/*
+ * The submitqueue priority should be between 0 and MSM_PARAM_PRIORITIES-1,
+ * a lower numeric value is higher priority.
+ */
 struct drm_msm_submitqueue {
 	__u32 flags;   /* in, MSM_SUBMITQUEUE_x */
 	__u32 prio;    /* in, Priority level */

include/drm-uapi/v3d_drm.h

@@ -38,6 +38,9 @@ extern "C" {
 #define DRM_V3D_GET_BO_OFFSET                     0x05
 #define DRM_V3D_SUBMIT_TFU                        0x06
 #define DRM_V3D_SUBMIT_CSD                        0x07
+#define DRM_V3D_PERFMON_CREATE                    0x08
+#define DRM_V3D_PERFMON_DESTROY                   0x09
+#define DRM_V3D_PERFMON_GET_VALUES                0x0a
 
 #define DRM_IOCTL_V3D_SUBMIT_CL           DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CL, struct drm_v3d_submit_cl)
 #define DRM_IOCTL_V3D_WAIT_BO             DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_WAIT_BO, struct drm_v3d_wait_bo)
@@ -47,6 +50,12 @@ extern "C" {
 #define DRM_IOCTL_V3D_GET_BO_OFFSET       DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_GET_BO_OFFSET, struct drm_v3d_get_bo_offset)
 #define DRM_IOCTL_V3D_SUBMIT_TFU          DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_TFU, struct drm_v3d_submit_tfu)
 #define DRM_IOCTL_V3D_SUBMIT_CSD          DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CSD, struct drm_v3d_submit_csd)
+#define DRM_IOCTL_V3D_PERFMON_CREATE      DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_CREATE, \
+						   struct drm_v3d_perfmon_create)
+#define DRM_IOCTL_V3D_PERFMON_DESTROY     DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_DESTROY, \
+						   struct drm_v3d_perfmon_destroy)
+#define DRM_IOCTL_V3D_PERFMON_GET_VALUES  DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_GET_VALUES, \
+						   struct drm_v3d_perfmon_get_values)
 
 #define DRM_V3D_SUBMIT_CL_FLUSH_CACHE             0x01
 
@@ -127,6 +136,11 @@ struct drm_v3d_submit_cl {
 	__u32 bo_handle_count;
 
 	__u32 flags;
+
+	/* ID of the perfmon to attach to this job. 0 means no perfmon. */
+	__u32 perfmon_id;
+
+	__u32 pad;
 };
 
 /**
@@ -195,6 +209,7 @@ enum drm_v3d_param {
 	DRM_V3D_PARAM_SUPPORTS_TFU,
 	DRM_V3D_PARAM_SUPPORTS_CSD,
 	DRM_V3D_PARAM_SUPPORTS_CACHE_FLUSH,
+	DRM_V3D_PARAM_SUPPORTS_PERFMON,
 };
 
 struct drm_v3d_get_param {
@@ -258,6 +273,127 @@ struct drm_v3d_submit_csd {
 	__u32 in_sync;
 	/* Sync object to signal when the CSD job is done. */
 	__u32 out_sync;
+
+	/* ID of the perfmon to attach to this job. 0 means no perfmon. */
+	__u32 perfmon_id;
+};
+
+enum {
+	V3D_PERFCNT_FEP_VALID_PRIMTS_NO_PIXELS,
+	V3D_PERFCNT_FEP_VALID_PRIMS,
+	V3D_PERFCNT_FEP_EZ_NFCLIP_QUADS,
+	V3D_PERFCNT_FEP_VALID_QUADS,
+	V3D_PERFCNT_TLB_QUADS_STENCIL_FAIL,
+	V3D_PERFCNT_TLB_QUADS_STENCILZ_FAIL,
+	V3D_PERFCNT_TLB_QUADS_STENCILZ_PASS,
+	V3D_PERFCNT_TLB_QUADS_ZERO_COV,
+	V3D_PERFCNT_TLB_QUADS_NONZERO_COV,
+	V3D_PERFCNT_TLB_QUADS_WRITTEN,
+	V3D_PERFCNT_PTB_PRIM_VIEWPOINT_DISCARD,
+	V3D_PERFCNT_PTB_PRIM_CLIP,
+	V3D_PERFCNT_PTB_PRIM_REV,
+	V3D_PERFCNT_QPU_IDLE_CYCLES,
+	V3D_PERFCNT_QPU_ACTIVE_CYCLES_VERTEX_COORD_USER,
+	V3D_PERFCNT_QPU_ACTIVE_CYCLES_FRAG,
+	V3D_PERFCNT_QPU_CYCLES_VALID_INSTR,
+	V3D_PERFCNT_QPU_CYCLES_TMU_STALL,
+	V3D_PERFCNT_QPU_CYCLES_SCOREBOARD_STALL,
+	V3D_PERFCNT_QPU_CYCLES_VARYINGS_STALL,
+	V3D_PERFCNT_QPU_IC_HIT,
+	V3D_PERFCNT_QPU_IC_MISS,
+	V3D_PERFCNT_QPU_UC_HIT,
+	V3D_PERFCNT_QPU_UC_MISS,
+	V3D_PERFCNT_TMU_TCACHE_ACCESS,
+	V3D_PERFCNT_TMU_TCACHE_MISS,
+	V3D_PERFCNT_VPM_VDW_STALL,
+	V3D_PERFCNT_VPM_VCD_STALL,
+	V3D_PERFCNT_BIN_ACTIVE,
+	V3D_PERFCNT_RDR_ACTIVE,
+	V3D_PERFCNT_L2T_HITS,
+	V3D_PERFCNT_L2T_MISSES,
+	V3D_PERFCNT_CYCLE_COUNT,
+	V3D_PERFCNT_QPU_CYCLES_STALLED_VERTEX_COORD_USER,
+	V3D_PERFCNT_QPU_CYCLES_STALLED_FRAGMENT,
+	V3D_PERFCNT_PTB_PRIMS_BINNED,
+	V3D_PERFCNT_AXI_WRITES_WATCH_0,
+	V3D_PERFCNT_AXI_READS_WATCH_0,
+	V3D_PERFCNT_AXI_WRITE_STALLS_WATCH_0,
+	V3D_PERFCNT_AXI_READ_STALLS_WATCH_0,
+	V3D_PERFCNT_AXI_WRITE_BYTES_WATCH_0,
+	V3D_PERFCNT_AXI_READ_BYTES_WATCH_0,
+	V3D_PERFCNT_AXI_WRITES_WATCH_1,
+	V3D_PERFCNT_AXI_READS_WATCH_1,
+	V3D_PERFCNT_AXI_WRITE_STALLS_WATCH_1,
+	V3D_PERFCNT_AXI_READ_STALLS_WATCH_1,
+	V3D_PERFCNT_AXI_WRITE_BYTES_WATCH_1,
+	V3D_PERFCNT_AXI_READ_BYTES_WATCH_1,
+	V3D_PERFCNT_TLB_PARTIAL_QUADS,
+	V3D_PERFCNT_TMU_CONFIG_ACCESSES,
+	V3D_PERFCNT_L2T_NO_ID_STALL,
+	V3D_PERFCNT_L2T_COM_QUE_STALL,
+	V3D_PERFCNT_L2T_TMU_WRITES,
+	V3D_PERFCNT_TMU_ACTIVE_CYCLES,
+	V3D_PERFCNT_TMU_STALLED_CYCLES,
+	V3D_PERFCNT_CLE_ACTIVE,
+	V3D_PERFCNT_L2T_TMU_READS,
+	V3D_PERFCNT_L2T_CLE_READS,
+	V3D_PERFCNT_L2T_VCD_READS,
+	V3D_PERFCNT_L2T_TMUCFG_READS,
+	V3D_PERFCNT_L2T_SLC0_READS,
+	V3D_PERFCNT_L2T_SLC1_READS,
+	V3D_PERFCNT_L2T_SLC2_READS,
+	V3D_PERFCNT_L2T_TMU_W_MISSES,
+	V3D_PERFCNT_L2T_TMU_R_MISSES,
+	V3D_PERFCNT_L2T_CLE_MISSES,
+	V3D_PERFCNT_L2T_VCD_MISSES,
+	V3D_PERFCNT_L2T_TMUCFG_MISSES,
+	V3D_PERFCNT_L2T_SLC0_MISSES,
+	V3D_PERFCNT_L2T_SLC1_MISSES,
+	V3D_PERFCNT_L2T_SLC2_MISSES,
+	V3D_PERFCNT_CORE_MEM_WRITES,
+	V3D_PERFCNT_L2T_MEM_WRITES,
+	V3D_PERFCNT_PTB_MEM_WRITES,
+	V3D_PERFCNT_TLB_MEM_WRITES,
+	V3D_PERFCNT_CORE_MEM_READS,
+	V3D_PERFCNT_L2T_MEM_READS,
+	V3D_PERFCNT_PTB_MEM_READS,
+	V3D_PERFCNT_PSE_MEM_READS,
+	V3D_PERFCNT_TLB_MEM_READS,
+	V3D_PERFCNT_GMP_MEM_READS,
+	V3D_PERFCNT_PTB_W_MEM_WORDS,
+	V3D_PERFCNT_TLB_W_MEM_WORDS,
+	V3D_PERFCNT_PSE_R_MEM_WORDS,
+	V3D_PERFCNT_TLB_R_MEM_WORDS,
+	V3D_PERFCNT_TMU_MRU_HITS,
+	V3D_PERFCNT_COMPUTE_ACTIVE,
+	V3D_PERFCNT_NUM,
+};
+
+#define DRM_V3D_MAX_PERF_COUNTERS                 32
+
+struct drm_v3d_perfmon_create {
+	__u32 id;
+	__u32 ncounters;
+	__u8 counters[DRM_V3D_MAX_PERF_COUNTERS];
+};
+
+struct drm_v3d_perfmon_destroy {
+	__u32 id;
+};
+
+/*
+ * Returns the values of the performance counters tracked by this
+ * perfmon (as an array of ncounters u64 values).
+ *
+ * No implicit synchronization is performed, so the user has to
+ * guarantee that any jobs using this perfmon have already been
+ * completed  (probably by blocking on the seqno returned by the
+ * last exec that used the perfmon).
+ */
+struct drm_v3d_perfmon_get_values {
+	__u32 id;
+	__u32 pad;
+	__u64 values_ptr;
 };
 
 #if defined(__cplusplus)

include/drm-uapi/virtgpu_drm.h

@@ -47,12 +47,15 @@ extern "C" {
 #define DRM_VIRTGPU_WAIT     0x08
 #define DRM_VIRTGPU_GET_CAPS  0x09
 #define DRM_VIRTGPU_RESOURCE_CREATE_BLOB 0x0a
+#define DRM_VIRTGPU_CONTEXT_INIT 0x0b
 
 #define VIRTGPU_EXECBUF_FENCE_FD_IN	0x01
 #define VIRTGPU_EXECBUF_FENCE_FD_OUT	0x02
+#define VIRTGPU_EXECBUF_RING_IDX	0x04
 #define VIRTGPU_EXECBUF_FLAGS  (\
 		VIRTGPU_EXECBUF_FENCE_FD_IN |\
 		VIRTGPU_EXECBUF_FENCE_FD_OUT |\
+		VIRTGPU_EXECBUF_RING_IDX |\
 		0)
 
 struct drm_virtgpu_map {
@@ -68,6 +71,8 @@ struct drm_virtgpu_execbuffer {
 	__u64 bo_handles;
 	__u32 num_bo_handles;
 	__s32 fence_fd; /* in/out fence fd (see VIRTGPU_EXECBUF_FENCE_FD_IN/OUT) */
+	__u32 ring_idx; /* command ring index (see VIRTGPU_EXECBUF_RING_IDX) */
+	__u32 pad;
 };
 
 #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
@@ -75,6 +80,8 @@ struct drm_virtgpu_execbuffer {
 #define VIRTGPU_PARAM_RESOURCE_BLOB 3 /* DRM_VIRTGPU_RESOURCE_CREATE_BLOB */
 #define VIRTGPU_PARAM_HOST_VISIBLE 4 /* Host blob resources are mappable */
 #define VIRTGPU_PARAM_CROSS_DEVICE 5 /* Cross virtio-device resource sharing  */
+#define VIRTGPU_PARAM_CONTEXT_INIT 6 /* DRM_VIRTGPU_CONTEXT_INIT */
+#define VIRTGPU_PARAM_SUPPORTED_CAPSET_IDs 7 /* Bitmask of supported capability set ids */
 
 struct drm_virtgpu_getparam {
 	__u64 param;
@@ -173,6 +180,22 @@ struct drm_virtgpu_resource_create_blob {
 	__u64 blob_id;
 };
 
+#define VIRTGPU_CONTEXT_PARAM_CAPSET_ID       0x0001
+#define VIRTGPU_CONTEXT_PARAM_NUM_RINGS       0x0002
+#define VIRTGPU_CONTEXT_PARAM_POLL_RINGS_MASK 0x0003
+struct drm_virtgpu_context_set_param {
+	__u64 param;
+	__u64 value;
+};
+
+struct drm_virtgpu_context_init {
+	__u32 num_params;
+	__u32 pad;
+
+	/* pointer to drm_virtgpu_context_set_param array */
+	__u64 ctx_set_params;
+};
+
 #define DRM_IOCTL_VIRTGPU_MAP \
 	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map)
 
@@ -212,6 +235,10 @@ struct drm_virtgpu_resource_create_blob {
 	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_RESOURCE_CREATE_BLOB,	\
 		struct drm_virtgpu_resource_create_blob)
 
+#define DRM_IOCTL_VIRTGPU_CONTEXT_INIT					\
+	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_CONTEXT_INIT,		\
+		struct drm_virtgpu_context_init)
+
 #if defined(__cplusplus)
 }
 #endif

include/pci_ids/iris_pci_ids.h

@@ -14,6 +14,8 @@ CHIPSET(0x4690, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4691, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4692, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4693, adl_gt05, "ADL-S GT0.5", "Intel(R) Graphics")
+CHIPSET(0x4698, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
+CHIPSET(0x4699, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 
 CHIPSET(0x4626, adl_gt2, "ADL GT2", "Intel(R) Graphics")
 CHIPSET(0x4628, adl_gt2, "ADL GT2", "Intel(R) Graphics")
@@ -46,5 +48,7 @@ CHIPSET(0x9AC9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AD9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AF8, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 
-/* Disabled for now until kernel support is ready */
-/* CHIPSET(0x4905, dg1, "DG1 GT2", "Intel(R) Graphics") */
+CHIPSET(0x4905, dg1, "DG1", "Intel(R) Graphics")
+CHIPSET(0x4906, dg1, "DG1", "Intel(R) Graphics")
+CHIPSET(0x4907, sg1, "SG1", "Intel(R) Graphics")
+CHIPSET(0x4908, dg1, "DG1", "Intel(R) Graphics")