Merge remote-tracking branch 'origin/master' into obsd

5 files changed, 36 insertions, 44 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52f9d491..4cd462b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,10 @@
 # recommended except for ephemeral images during development.
 #
 variables:
-  FDO_DISTRIBUTION_VERSION: buster-slim
+  FDO_DISTRIBUTION_VERSION: bookworm-slim
   FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
-  FDO_DISTRIBUTION_TAG: "2021-05-10"
+  FDO_DISTRIBUTION_PACKAGES: 'ca-certificates'
+  FDO_DISTRIBUTION_TAG: "2024-02-23.2"
   FDO_UPSTREAM_REPO: xorg/driver/xf86-video-ati
 
 #
@@ -19,7 +20,7 @@ variables:
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 9568e38927f9e9c48d4f586f84a071c3a4bdcd39 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -105,21 +106,22 @@ build-distcheck:
   - make install V=1
   - make -j${FDO_CI_CONCURRENT:-4} distcheck
   variables:
-    XSERVER_VERSION: "1.20"
+    XSERVER_VERSION: "21.1"
 
+# excludes version already checked in build-distcheck
 build-gcc:
   extends:
     - .default_build
   parallel:
     matrix:
-      - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19"]
+      - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19", "1.20"]
 
 build-clang:
   extends:
     - .default_build
   parallel:
     matrix:
-      - XSERVER_VERSION: ["1.20", "1.18", "1.19"]
+      - XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"]
   variables:
     CC: clang
 
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 4e528588..f010cd0b 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -3,7 +3,7 @@
 set -e
 set -o xtrace
 
-echo 'deb-src https://deb.debian.org/debian buster main' >/etc/apt/sources.list.d/deb-src.list
+echo 'deb-src https://deb.debian.org/debian bookworm main' >/etc/apt/sources.list.d/deb-src.list
 apt-get update
 
 
@@ -25,7 +25,7 @@ apt-get install -y --no-remove \
 echo 'APT::Get::Build-Dep-Automatic "true";' >>/etc/apt/apt.conf
 apt-get build-dep -y xorg-server
 
-
+# xserver 1.18 and older branches require libXfont 1.5 instead of 2.0
 git clone https://gitlab.freedesktop.org/xorg/lib/libXfont.git
 cd libXfont
 git checkout libXfont-1.5-branch
@@ -40,16 +40,24 @@ cd xserver
 
 for VERSION in 1.13 1.14 1.15; do
     git checkout server-${VERSION}-branch
-    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2
+    # Workaround glvnd having reset the version in gl.pc from what Mesa used
+    # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
+    sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac
+    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --disable-dmx
     make -C include install-nodist_sdkHEADERS
     make install-headers install-aclocalDATA install-pkgconfigDATA clean
+    git restore configure.ac
 done
 
-for VERSION in 1.16 1.17 1.18 1.19 1.20; do
+for VERSION in 1.16 1.17 1.18 1.19 1.20 21.1; do
     git checkout server-${VERSION}-branch
-    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --enable-dri3 --enable-glamor
+    # Workaround glvnd having reset the version in gl.pc from what Mesa used
+    # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
+    sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac
+    ./autogen.sh --prefix=/usr/local/xserver-$VERSION --enable-dri2 --enable-dri3 --enable-glamor --disable-dmx
     make -C include install-nodist_sdkHEADERS
     make install-headers install-aclocalDATA install-pkgconfigDATA clean
+    git restore configure.ac
 done
 
 cd ..
@@ -65,6 +73,8 @@ apt-get install -y --no-remove \
 	libpciaccess-dev \
 	libpixman-1-dev \
 	libudev-dev \
+	libxcvt-dev \
+	mesa-common-dev \
 	xutils-dev \
 	x11proto-dev
 
diff --git a/README.md b/README.md
index 98666d48..6897feab 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,17 @@
-xf86-video-ati - ATI/AMD Radeon video driver for the Xorg X server
-------------------------------------------------------------------
+xf86-video-ati - Xorg driver for ATI/AMD Radeon GPUs using the radeon kernel driver
+===================================================================================
 
-Patches and questions regarding this software should be directed at the
-amd-gfx mailing list:
+Questions regarding this software should be directed at the
+[amd-gfx mailing list](https://lists.freedesktop.org/mailman/listinfo/amd-gfx).
 
-  https://lists.freedesktop.org/mailman/listinfo/amd-gfx
+The
+[main development code repository](https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati)
+can be found at FreeDesktop Gitlab.
 
-Please submit bug reports to the Xorg bugzilla:
+Please submit bug reports there and use merge requests for patch submission.
 
-  https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Radeon
+See the X.org wiki for
+[further patch submission instructions](https://www.x.org/wiki/Development/Documentation/SubmittingPatches)
+and
+[more information on the git code manager](https://wiki.x.org/wiki/GitPage).
 
-The primary development code repository can be found at:
-
-  https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
-
-For patch submission instructions, see:
-
-  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index fc80ed74..8d4e76a5 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -206,23 +206,13 @@ Bool RADEONAccelInit(ScreenPtr pScreen)
 static void RADEONInit3DEngineInternal(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
-    uint32_t gb_tile_config, vap_cntl;
+    uint32_t vap_cntl;
 
     info->accel_state->texW[0] = info->accel_state->texH[0] =
 	info->accel_state->texW[1] = info->accel_state->texH[1] = 1;
 
     if (IS_R300_3D || IS_R500_3D) {
 
-	gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16);
-
-	switch(info->accel_state->num_gb_pipes) {
-	case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break;
-	case 3: gb_tile_config |= R300_PIPE_COUNT_R420_3P; break;
-	case 4: gb_tile_config |= R300_PIPE_COUNT_R420; break;
-	default:
-	case 1: gb_tile_config |= R300_PIPE_COUNT_RV350; break;
-	}
-
 	BEGIN_RING(2*3);
 	OUT_RING_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D | R300_DC_FREE_3D);
 	OUT_RING_REG(R300_RB3D_ZCACHE_CTLSTAT, R300_ZC_FLUSH | R300_ZC_FREE);
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 17983779..fba56e5d 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -111,7 +111,6 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
     PixmapPtr pixmap;
     int flags;
     unsigned front_width;
-    uint32_t tiling = 0;
     unsigned aligned_width = drawable->width;
     unsigned height = drawable->height;
     Bool is_glamor_pixmap = FALSE;
@@ -217,13 +216,6 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
 	    flags = 0;
 	}
 
-	if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO)
-	    tiling |= RADEON_TILING_MICRO;
-	if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO_SQUARE)
-	    tiling |= RADEON_TILING_MICRO_SQUARE;
-	if (flags & RADEON_CREATE_PIXMAP_TILING_MACRO)
-	    tiling |= RADEON_TILING_MACRO;
-
 	if (aligned_width == front_width)
 	    aligned_width = pScrn->virtualX;