.gitlab-ci.yml

@@ -18,9 +18,9 @@ include:
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
     file:
-      - '/templates/debian.yml'
-      - '/templates/freebsd.yml'
-      - '/templates/ci-fairy.yml'
+    - '/templates/debian.yml'
+    - '/templates/freebsd.yml'
+    - '/templates/ci-fairy.yml'
 
 variables:
   FDO_UPSTREAM_REPO: mesa/libdrm
@@ -39,11 +39,11 @@ stages:
 .os-debian:
   variables:
     BUILD_OS: debian
-    FDO_DISTRIBUTION_VERSION: trixie-slim
+    FDO_DISTRIBUTION_VERSION: bookworm
     FDO_DISTRIBUTION_PACKAGES: 'build-essential docbook-xsl libatomic-ops-dev libcairo2-dev libcunit1-dev libpciaccess-dev meson ninja-build pkg-config python3 python3-pip python3-wheel python3-setuptools python3-docutils valgrind'
     # bump this tag every time you change something which requires rebuilding the
     # base image
-    FDO_DISTRIBUTION_TAG: "2026-04-27.0"
+    FDO_DISTRIBUTION_TAG: "2024-06-25.0"
 
 .debian-x86_64:
   extends:

amdgpu/amdgpu_asic_id.c

@@ -238,7 +238,7 @@ static char *find_asic_id_table(void)
 {
 	// first check the paths in AMDGPU_ASIC_ID_TABLE_PATHS environment variable
 	const char *amdgpu_asic_id_table_paths = secure_getenv("AMDGPU_ASIC_ID_TABLE_PATHS");
-	const char *file_name = NULL;
+	char *file_name = NULL;
 	char *found_path = NULL;
 	char **paths = NULL;
 

meson.build

@@ -26,7 +26,7 @@
 project(
   'libdrm',
   ['c'],
-  version : '2.4.133',
+  version : '2.4.132',
   license : 'MIT',
   meson_version : '>= 0.59',
   default_options : ['buildtype=debugoptimized', 'c_std=c11'],

meson_options.txt

@@ -46,11 +46,13 @@ option(
 option(
   'omap',
   type : 'feature',
+  value : 'disabled',
   description : '''Enable support for OMAP's experimental KMS API.''',
 )
 option(
   'exynos',
   type : 'feature',
+  value : 'disabled',
   description : '''Enable support for EXYNOS's experimental KMS API.''',
 )
 option(
@@ -61,6 +63,7 @@ option(
 option(
   'tegra',
   type : 'feature',
+  value : 'disabled',
   description : '''Enable support for Tegra's experimental KMS API.''',
 )
 option(

omap/omap_drm.c

@@ -27,6 +27,7 @@
  */
 
 #include <stdlib.h>
+#include <linux/types.h>
 #include <errno.h>
 #include <sys/mman.h>
 #include <fcntl.h>

tests/modetest/modetest.c

@@ -1974,8 +1974,7 @@ static int parse_connector(struct pipe_arg *pipe, const char *arg)
 	unsigned int len;
 	unsigned int i;
 	const char *p;
-	const char *endp;
-	char *endp_tok;
+	char *endp;
 
 	pipe->vrefresh = 0;
 	pipe->crtc_id = (uint32_t)-1;
@@ -2013,8 +2012,7 @@ static int parse_connector(struct pipe_arg *pipe, const char *arg)
 		return -1;
 	if (*endp == '@') {
 		arg = endp + 1;
-		pipe->crtc_id = strtoul(arg, &endp_tok, 10);
-		endp = endp_tok;
+		pipe->crtc_id = strtoul(arg, &endp, 10);
 	}
 	if (*endp != ':')
 		return -1;
@@ -2030,8 +2028,8 @@ static int parse_connector(struct pipe_arg *pipe, const char *arg)
 	pipe->mode_str[len] = '\0';
 
 	if (*p == '-') {
-		pipe->vrefresh = strtof(p + 1, &endp_tok);
-		p = endp_tok;
+		pipe->vrefresh = strtof(p + 1, &endp);
+		p = endp;
 	}
 
 	if (*p == '@') {

util_math.h

@@ -24,8 +24,6 @@
 #ifndef _UTIL_MATH_H_
 #define _UTIL_MATH_H_
 
-#include <stdint.h>
-
 #define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )
 #define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
 #define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))