README.rst

@@ -58,6 +58,3 @@ The AMDGPU driver requires the `amdgpu.ids` file. It is usually located at
 paths at runtime by setting the `AMDGPU_ASIC_ID_TABLE_PATHS` environment
 variable with one or more colon-separated paths where to search for the
 `amdgpu.ids` file.
-
-For this option to be available, the C library must support secure_getenv()
-function. In systems without it (like NetBSD), this option won't be available.

amdgpu/amdgpu_asic_id.c

@@ -165,7 +165,6 @@ static void amdgpu_parse_proc_cpuinfo(struct amdgpu_device *dev)
 	fclose(fp);
 }
 
-#if HAVE_SECURE_GETENV
 static char *join_path(const char *dir, const char *file) {
 	size_t dir_len = strlen(dir);
 	size_t file_len = strlen(file);
@@ -269,7 +268,6 @@ static char *find_asic_id_table(void)
 	split_env_var_free(paths);
 	return found_path;
 }
-#endif
 
 void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
 {
@@ -280,12 +278,8 @@ void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
 	int line_num = 1;
 	int r = 0;
 
-	char *amdgpu_asic_id_table_path = NULL;
-#if HAVE_SECURE_GETENV
-	// if this system lacks secure_getenv(), don't allow extra paths
-	// for security reasons.
-	amdgpu_asic_id_table_path = find_asic_id_table();
-#endif
+	char *amdgpu_asic_id_table_path = find_asic_id_table();
+
 	// if not found, use the default AMDGPU_ASIC_ID_TABLE path
 	if (!amdgpu_asic_id_table_path)
 		amdgpu_asic_id_table_path = strdup(AMDGPU_ASIC_ID_TABLE);

data/amdgpu.ids

@@ -39,11 +39,11 @@
 1506,	C3,	AMD Radeon 610M
 1506,	C4,	AMD Radeon 610M
 150E,	C1,	AMD Radeon 890M Graphics
-150E,	C4,	AMD Radeon 880M Graphics
+150E,	C4,	AMD Radeon 890M Graphics
 150E,	C5,	AMD Radeon 890M Graphics
 150E,	C6,	AMD Radeon 890M Graphics
 150E,	D1,	AMD Radeon 890M Graphics
-150E,	D2,	AMD Radeon 880M Graphics
+150E,	D2,	AMD Radeon 890M Graphics
 150E,	D3,	AMD Radeon 890M Graphics
 1586,	C1,	Radeon 8060S Graphics
 1586,	C2,	Radeon 8050S Graphics
@@ -577,7 +577,6 @@
 7480,	C3,	AMD Radeon RX 7600S
 7480,	C7,	AMD Radeon RX 7600M XT
 7480,	CF,	AMD Radeon RX 7600
-7481,   C7,     AMD Steam Machine
 7483,	CF,	AMD Radeon RX 7600M
 7489,	00,	AMD Radeon Pro W7500
 7499,	00,	AMD Radeon Pro W7400

meson.build

@@ -26,7 +26,7 @@
 project(
   'libdrm',
   ['c'],
-  version : '2.4.131',
+  version : '2.4.130',
   license : 'MIT',
   meson_version : '>= 0.59',
   default_options : ['buildtype=debugoptimized', 'c_std=c11'],
@@ -51,8 +51,6 @@ dep_threads = dependency('threads')
 
 cc = meson.get_compiler('c')
 
-config.set10('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
-
 android = cc.compiles('''int func() { return __ANDROID__; }''')
 
 # Solaris / Illumos