feat: update libdrm to 2.4.131-1

.gitlab-ci.yml

@@ -12,7 +12,7 @@
 # main repository, it's recommended to remove the image from the source
 # repository's container registry, so that the image from the main
 # repository's registry will be used there as well.
-.templates_sha: &template_sha b61a03cabbf308e81289f7aaaf0b5a80a34ffb99 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha c6aeb16f86e32525fa630fb99c66c4f3e62fc3cb # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -23,7 +23,7 @@ include:
     - '/templates/ci-fairy.yml'
 
 variables:
-  FDO_UPSTREAM_REPO: mesa/drm
+  FDO_UPSTREAM_REPO: mesa/libdrm
   FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
 
 stages:
@@ -62,15 +62,16 @@ stages:
     - .os-debian
   variables:
     BUILD_ARCH: "armv7"
+    FDO_DISTRIBUTION_PLATFORM: linux/arm/v7
 
 .os-freebsd:
   variables:
     BUILD_OS: freebsd
-    FDO_DISTRIBUTION_VERSION: "14.1"
-    FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess py39-docutils cairo'
+    FDO_DISTRIBUTION_VERSION: "14.2"
+    FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess textproc/py-docutils cairo'
     # bump this tag every time you change something which requires rebuilding the
     # base image
-    FDO_DISTRIBUTION_TAG: "2026-26-25.0"
+    FDO_DISTRIBUTION_TAG: "2025-05-22.0"
 
 .freebsd-x86_64:
   extends:

Android.bp

@@ -59,6 +59,14 @@ cc_library_headers {
     ],
 }
 
+genrule {
+    name: "generated_static_table_fourcc_h",
+    out: ["generated_static_table_fourcc.h"],
+    srcs: ["include/drm/drm_fourcc.h"],
+    tool_files: ["gen_table_fourcc.py"],
+    cmd: "python3 $(location gen_table_fourcc.py) $(in) $(out)",
+}
+
 // Library for the device
 cc_library {
     name: "libdrm",
@@ -70,6 +78,10 @@ cc_library {
         "libdrm_sources",
     ],
 
+    generated_headers: [
+        "generated_static_table_fourcc_h",
+    ],
+
     export_include_dirs: ["include/drm", "android"],
 
     cflags: [

README.rst

@@ -49,3 +49,15 @@ Then use ninja to build and install:
 
 If you are installing into a system location you will need to run install
 separately, and as root.
+
+AMDGPU ASIC table file
+----------------------
+
+The AMDGPU driver requires the `amdgpu.ids` file. It is usually located at
+`$PREFIX/share/libdrm`, but it is possible to specify a set of alternative
+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-symbols.txt

@@ -14,6 +14,7 @@ amdgpu_bo_query_info
 amdgpu_bo_set_metadata
 amdgpu_bo_va_op
 amdgpu_bo_va_op_raw
+amdgpu_bo_va_op_raw2
 amdgpu_bo_wait_for_idle
 amdgpu_create_bo_from_user_mem
 amdgpu_cs_chunk_fence_info_to_data
@@ -70,6 +71,7 @@ amdgpu_query_hw_ip_count
 amdgpu_query_hw_ip_info
 amdgpu_query_info
 amdgpu_query_sensor_info
+amdgpu_query_uq_fw_area_info
 amdgpu_query_video_caps_info
 amdgpu_read_mm_registers
 amdgpu_va_manager_alloc
@@ -82,3 +84,7 @@ amdgpu_va_get_start_addr
 amdgpu_va_range_query
 amdgpu_vm_reserve_vmid
 amdgpu_vm_unreserve_vmid
+amdgpu_create_userqueue
+amdgpu_free_userqueue
+amdgpu_userq_signal
+amdgpu_userq_wait

amdgpu/amdgpu.h

@@ -42,7 +42,10 @@ extern "C" {
 #endif
 
 struct drm_amdgpu_info_hw_ip;
+struct drm_amdgpu_info_uq_fw_areas;
 struct drm_amdgpu_bo_list_entry;
+struct drm_amdgpu_userq_signal;
+struct drm_amdgpu_userq_wait;
 
 /*--------------------------------------------------------------------------*/
 /* --------------------------- Defines ------------------------------------ */
@@ -1172,6 +1175,26 @@ int amdgpu_query_hw_ip_info(amdgpu_device_handle dev, unsigned type,
 			    unsigned ip_instance,
 			    struct drm_amdgpu_info_hw_ip *info);
 
+/**
+ * Query FW area related information.
+ *
+ * The return size is query-specific and depends on the "type" parameter.
+ * No more than "size" bytes is returned.
+ *
+ * \param	dev		- \c [in] Device handle. See #amdgpu_device_initialize()
+ * \param	type		- \c [in] AMDGPU_HW_IP_*
+ * \param	ip_instance	- \c [in] HW IP index.
+ * \param	info		- \c [out] The pointer to return value
+ *
+ * \return   0 on success\n
+ *          <0 - Negative POSIX error code
+ *
+*/
+int amdgpu_query_uq_fw_area_info(amdgpu_device_handle dev,
+				  unsigned type,
+				  unsigned ip_instance,
+				  struct drm_amdgpu_info_uq_fw_areas *info);
+
 /**
  * Query heap information
  *
@@ -1511,6 +1534,42 @@ int amdgpu_bo_va_op_raw(amdgpu_device_handle dev,
 			uint64_t flags,
 			uint32_t ops);
 
+/**
+ *  VA mapping/unmapping of buffer object for usermode queue.
+ *
+ * This is not a simple drop-in extension for amdgpu_bo_va_op; instead, all
+ * parameters are treated "raw2", i.e. size is not automatically aligned, and
+ * all flags must be specified explicitly.
+ *
+ * \param  dev				- \c [in] device handle
+ * \param  bo				- \c [in] BO handle (may be NULL)
+ * \param  offset			- \c [in] Start offset to map
+ * \param  size				- \c [in] Size to map
+ * \param  addr				- \c [in] Start virtual address.
+ * \param  flags			- \c [in] Supported flags for mapping/unmapping
+ * \param  ops				- \c [in] AMDGPU_VA_OP_MAP or AMDGPU_VA_OP_UNMAP
+ * \param  vm_timeline_syncobj_out	- \c [out] syncobj handle for PT update fence
+ * \param  vm_timeline_point		- \c [in] input timeline point
+ * \param  input_fence_syncobj_handles	- \c [in] Array of syncobj handles for bo unmap,
+ * 						  clear and replace
+ * \param  num_syncobj_handles		- \c [in] Number of syncobj handles
+ *
+ * \return   0 on success\n
+ *          <0 - Negative POSIX Error code
+ *
+*/
+int amdgpu_bo_va_op_raw2(amdgpu_device_handle dev,
+			 amdgpu_bo_handle bo,
+			 uint64_t offset,
+			 uint64_t size,
+			 uint64_t addr,
+			 uint64_t flags,
+			 uint32_t ops,
+			 uint32_t vm_timeline_syncobj_out,
+			 uint64_t vm_timeline_point,
+			 uint64_t input_fence_syncobj_array_in,
+			 uint32_t num_syncobj_handles_in);
+
 /**
  *  create semaphore
  *
@@ -1942,6 +2001,65 @@ int amdgpu_vm_reserve_vmid(amdgpu_device_handle dev, uint32_t flags);
 */
 int amdgpu_vm_unreserve_vmid(amdgpu_device_handle dev, uint32_t flags);
 
+/**
+ * Create USERQUEUE
+ * \param   dev			- \c [in] device handle
+ * \param   ip_type		- \c [in] ip type
+ * \param   doorbell_handle	- \c [in] doorbell handle
+ * \param   doorbell_offset	- \c [in] doorbell index
+ * \param   mqd_in		- \c [in] MQD data
+ * \param   queue_va		- \c [in] Virtual address of queue
+ * \param   queue_size		- \c [in] userqueue size
+ * \param   wptr_va		- \c [in] Virtual address of wptr
+ * \param   rptr_va		- \c [in] Virtual address of rptr
+ * \param   queue_id		- \c [out] queue id
+ *
+ * \return  0 on success otherwise POSIX Error code
+ */
+
+int amdgpu_create_userqueue(amdgpu_device_handle dev,
+			    uint32_t ip_type,
+			    uint32_t doorbell_handle,
+			    uint32_t doorbell_offset,
+			    uint64_t queue_va,
+			    uint64_t queue_size,
+			    uint64_t wptr_va,
+			    uint64_t rptr_va,
+			    void *mqd_in,
+			    uint32_t flags,
+			    uint32_t *queue_id);
+
+/**
+ * Free USERQUEUE
+ * \param   dev		- \c [in] device handle
+ * \param   queue_id	- \c [in]  queue id
+ *
+ * \return  0 on success otherwise POSIX Error code
+ */
+int amdgpu_free_userqueue(amdgpu_device_handle dev, uint32_t queue_id);
+
+/**
+ * Signal USERQUEUE
+ * \param   dev               - \c [in] device handle
+ * \param   signal_data       - \c [in] pointer to struct drm_amdgpu_userq_signal
+ *                                      to be filled by the caller
+ *
+ * \return  0 on success otherwise POSIX Error code
+ */
+int amdgpu_userq_signal(amdgpu_device_handle dev,
+		        struct drm_amdgpu_userq_signal *signal_data);
+
+/**
+ * Wait USERQUEUE
+ * \param   dev               - \c [in]     device handle
+ * \param   wait_data         - \c [in/out] pointer to struct drm_amdgpu_userq_wait
+ *                                          to be filled by the caller
+ *
+ * \return  0 on success otherwise POSIX Error code
+ */
+int amdgpu_userq_wait(amdgpu_device_handle dev,
+		      struct drm_amdgpu_userq_wait *wait_data);
+
 #ifdef __cplusplus
 }
 #endif