1960529 - Update libdrm to new version 43e8a3f86a8d578eb3accbca29021483d46f8479 from 2025-04-10 10:03:07

Status: RESOLVED FIXED

(Core :: WebRTC, defect)

Description

[Update Bot]

This update covers 6 commits. Here are the overall diff statistics, and then the commit information.

---

third_party/drm/drm/xf86drm.h | 2 +-
third_party/drm/moz.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

---

43e8a3f86a8d578eb3accbca29021483d46f8479 by Arvind Yadav <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/43e8a3f86a8d578eb3accbca29021483d46f8479
Authored: 2024-08-13 19:40:33 +0530
Committed: 2025-04-10 10:03:07 -0400

amdgpu: Add amdgpu userqueue IOCTL functions

This patch adds new IOCTL functions to support
userqueue create, remove, signal and wait etc.

v2:(Marek)

• Add csa support for SDMA queue.
• Addressed's review comments.
• Removed raw2/op2 ioctl.
• Added syncobj_timeline_handles in amdgpu_userq_wait IOCTL.

v3:(Yogesh)

• Rename timeline* objects as per UAPI review (Arvind).

v4: (Marek)

• Drop AMDGPU_USERQ_BO_WRITE as this should not be a global option
  of the IOCTL, It should be option per buffer. Hence adding separate
  array for read and write BO handles. (Arun)

• Modify num_fences to __u16, flags changed to __u16 and placed
  the num_fences next to flags for optimal padding and size. (Arun)

v5:(Marek/Pierre-Eric)

• add more detail params description for signal and wait IOCTL calls.

• Remove the unused structure fields in signal and wait structs.

• Add separate array of read and write for BO handles. (Arun)

• Removes the unused flags parameter from the
  amdgpu_create_userqueue IOCTL. (Arvind)

v6:(Pierre-Eric)

• Remove unused headers. (Arvind)

• Modify the function parameter names and struct
  field names as per the review comments. (Arun)

v7:(Marek)

• Modify the structure field name and comments. (Arun)

• Rename vm_timeline_syncobj and add comment for
  vm_timeline_point.

• Remove GDS buffer support from MQD. (Arvind)

v8:(Pierre-Eric)

• Modify the function parameter names.
• Added new function in amdgpu-symbols.txt (Arvind)

v9:(Marek)

• Use the drm signal/wait structure as the parameter. (Arun)

Cc: Deucher, Alexander <[e-mail]>
Cc: Koenig, Christian <[e-mail]>
Cc: Sharma, Shashank <[e-mail]>
Reviewed-by: Marek Olšák <[e-mail]>
Acked-by: Pierre-Eric Pelloux-Prayer <[e-mail]>
Signed-off-by: Arvind Yadav <[e-mail]>
Signed-off-by: Arunpravin Paneer Selvam <[e-mail]>

Files Added:

• amdgpu/amdgpu_userq.c

Files Modified:

• amdgpu/amdgpu-symbols.txt
• amdgpu/amdgpu.h
• amdgpu/amdgpu_bo.c
• amdgpu/meson.build

---

72d314042864205c86f935e4bd881955ba7b8cd9 by Arvind Yadav <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/72d314042864205c86f935e4bd881955ba7b8cd9
Authored: 2024-08-13 19:37:37 +0530
Committed: 2025-04-10 10:03:07 -0400

amdgpu: UAPI for AMDGPU usermode queues

This patch adds UAPI interface changes for AMDGPU usermode
queues, semaphore and new AMDGPU GEM domain for doorbells.
Usermode queues allow a userspace process to create
and submit its graphics/compute/sdma work directly to the GPU.

v2:(Marek)

• Add csa support for SDMA queue.
• Rename UAPI objects and struct as per UAPI review. (Shashank)

v3:(Yogesh)

• Rename UAPI timeline* objects as per UAPI review. (Arvind)

v4: (Marek)

• Drop AMDGPU_USERQ_BO_WRITE as this should not be a global option
  of the IOCTL, It should be option per buffer. Hence adding separate
  array for read and write BO handles. (Arun)

• Modify num_fences to __u16, flags changed to __u16 and placed
  the num_fences next to flags for optimal padding and size. (Arun)

• Fix 32-bit holes issue in sturct drm_amdgpu_gem_va as per
  UAPI review (Arvind).

v5:(Marek/Pierre-Eric)

• add more detail params description for signal and wait IOCTL calls.

• Remove the unused structure fields in signal and wait structs.

• Add separate array of read and write for BO handles. (Arun)

• Removes the unused flags parameter from the usermode queue UAPI structure

• Clarify comments on top of drm_amdgpu_userq_in

• Clarify comment for queue_id (in)

• Clarify comment for mqd

• Clarify comment for compute MQD size

• Clarify comment for queue_id (out)

• Adds padding variables in userqueue in/out structures. (Shashank)

v6:(Pierre-Eric)

• Modify the function parameter names and struct
  field names as per the review comments. (Arun)

v7:(Marek)

• Modify the structure field name and comments. (Arun)

• Rename vm_timeline_syncobj and add comment for
  vm_timeline_point.

• Remove GDS buffer support from MQD. (Arvind)

v8:(Pierre-Eric)

• Modify the function parameter names.

Cc: Koenig, Christian <[e-mail]>
Cc: Alex Deucher <[e-mail]>
Reviewed-by: Marek Olšák <[e-mail]>
Acked-by: Pierre-Eric Pelloux-Prayer <[e-mail]>
Signed-off-by: Shashank Sharma <[e-mail]>
Signed-off-by: Arvind Yadav <[e-mail]>
Signed-off-by: Arunpravin Paneer Selvam <[e-mail]>

Files Modified:

• include/drm/amdgpu_drm.h

---

5d7d7c43188f9420f4a5ca6b0e4177d5dda3bae9 by Shashank Sharma <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/5d7d7c43188f9420f4a5ca6b0e4177d5dda3bae9
Authored: 2024-11-05 12:08:44 +0100
Committed: 2025-04-10 13:20:00 +0000

drm/amdgpu: add new AMDGPU_INFO subquery for userqueue metadata

This patch:

• adds a new subquery (AMDGPU_INFO_UQ_FW_AREAS) in AMDGPU_INFO_IOCTL
  to get the size and alignment of shadow and csa objects from the
  kernel. This information is required for a userqueue consumer (like
  MESA/libdrm) to create the userqueue metadata objects properly.
• also adds supporting metadata structures and a high level wrapper
  function (amdgpu_query_uq_metadata_info) to the query, to make it
  easy to use.

The corresponding kernel changes for this UAPI extension can be found
in amd-gfx mailing list, link:
https://patchwork.freedesktop.org/patch/621390/?series=139715&rev=2

This patch adds support only for the GFX IP, and the other engines may
be supported in subsequent development.

V2: fix the build error due to exporting of helper function
V3: make an entry for amdgpu_query_uq_metadata_info in
amdgpu-symbols.txt
V4: Rename the subquery to AMDGPU_INFO_UQ_FW_AREAS (Marek, Pierre-Eric)
V5: Addressed review comments (Pierre-Eric):
- Fix the API comment to match the new IOCTL name
- remove the unused uq_metadata parameter

Cc: Marek Olsak <[e-mail]>
Cc: Pierre-Eric Pelloux-Prayer <[e-mail]>
Cc: Alex Deucher <[e-mail]>
Cc: Christian Koenig <[e-mail]>
Cc: Arvind Yadav <[e-mail]>
Reviewed-by: Marek Olsak <[e-mail]>
Signed-off-by: Shashank Sharma <[e-mail]>

Files Modified:

• amdgpu/amdgpu-symbols.txt
• amdgpu/amdgpu.h
• amdgpu/amdgpu_gpu_info.c
• include/drm/amdgpu_drm.h

---

d387ec976f1f86faa1fea5455ac86e84b55ce53f by Daniel van Vugt <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/d387ec976f1f86faa1fea5455ac86e84b55ce53f
Authored: 2025-03-27 17:41:37 +0800
Committed: 2025-03-27 17:43:05 +0800

xf86drm: Handle NULL in drmCopyVersion

Just as it is already handled in the caller, drmGetVersion.

I'm not sure what the offending driver is, but the Ubuntu incidents
seem to be coming from a dual Intel/Nvidia machine. And they show
it is card1 so I'm guessing nvidia-drm is the offender.

Related: https://bugs.launchpad.net/bugs/2104352

Files Modified:

• xf86drm.c

---

a7eb2cfd53a70fcd9ba9dcfad80a3994642f362f by Alex Deucher <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/a7eb2cfd53a70fcd9ba9dcfad80a3994642f362f
Authored: 2025-01-17 17:06:06 -0500
Committed: 2025-01-17 17:26:15 -0500

amdgpu: add new marketing names

Updated client names.

Signed-off-by: Alex Deucher <[e-mail]>

Files Modified:

• data/amdgpu.ids

---

c7684a957aa7dc98fbf8e595256b81d7de17cef8 by Simon Ser <[e-mail]>

https://gitlab.freedesktop.org/mesa/drm/commit/c7684a957aa7dc98fbf8e595256b81d7de17cef8
Authored: 2024-12-17 02:02:26 +0100
Committed: 2025-01-09 14:08:03 +0000

xf86drm: deprecate drmAvailable()

Signed-off-by: Simon Ser <[e-mail]>
References: https://gitlab.freedesktop.org/mesa/drm/-/issues/113

Files Modified:

• xf86drm.c

---

Comment 1

[Update Bot]

I've submitted a try run for this commit: https://treeherder.mozilla.org/jobs?repo=try&revision=9d3405450ab1af3a078f7209129f59381e968858

Comment 2

[Update Bot]

Attachment: Bug 1960529 - Update libdrm to 43e8a3f86a8d578eb3accbca29021483d46f8479

Comment 3

[Update Bot]

It looks like we experienced one or more build failures when trying to apply this
update. You will need to apply this update manually; you can replicate the patch
locally with ./mach vendor third_party/drm/moz.yaml. I'm going to abandon the Phabricator patch and
let you submit a new one.

If the build failure wasn't caused by a library change, and was instead caused by
something structural in the build system please let my maintainers know in
Slack:#secinf.

I do my best to automatically add new files to the build, but some moz.build files
are complicated and you may need to fix them manually.

Comment 4

[Andreas Pehrson [:pehrsons]]

Jan, this breaks because of your manual xf86drm.h change. It needs to be applied through vendoring so updatebot can re-apply it after updating to a new rev. Could you take a look?

Comment 5

[BugBot [:suhaib / :marco/ :calixte]]

Set release status flags based on info from the regressing bug 1954903

Comment 6

[Jan Grulich]

(In reply to Andreas Pehrson [:pehrsons] from comment #4)

Jan, this breaks because of your manual xf86drm.h change. It needs to be applied through vendoring so updatebot can re-apply it after updating to a new rev. Could you take a look?

Sure thing. I'm working on it now.

Comment 7

[Jan Grulich]

Submitted:
https://phabricator.services.mozilla.com/D246718
https://phabricator.services.mozilla.com/D246719

Comment 8

[Jan Grulich]

Attachment: Bug 1960529 - Do not modify vendored drm headers r=pehrsons,mjf

Do not change "#include <drm.h>" to include a "libdrm" path prefix in
xf86drm.h header since we can just modify include path instead. Fixes
issues we hit when vendoring newer libdrm version.

Comment 9

[Jan Grulich]

Attachment: Bug 1960529 - Regenerate moz.build files r=pehrsons,mjf

Regenerate moz.build files for the special handling in gn_processor.py
for drm library.

Generation command:

./mach python build/gn_processor.py
dom/media/webrtc/third_party_build/gn-configs/webrtc.json

Comment 10

[Jan Grulich]

Attachment: Bug 1960529 - Update libdrm to 15e174c1ed2426be3228eb595f942481cfcf5a90 r=pehrsons

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/ab349b4197fb
Do not modify vendored drm headers r=pehrsons,media-playback-reviewers,stransky
https://hg.mozilla.org/integration/autoland/rev/ebb32a5ff907
Regenerate moz.build files r=pehrsons,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/d4c22a75fd6b
Update libdrm to 15e174c1ed2426be3228eb595f942481cfcf5a90 r=pehrsons

Comment 12

[Atila Butkovits]

Backed out for causing bustages at FFmpegVideoFramePool.cpp.

Backout link: https://hg-edge.mozilla.org/integration/autoland/rev/a34b368a5b0c91c7ea730ef1fca348a6c4698463

Push with failures: https://treeherder.mozilla.org/jobs?repo=autoland&resultStatus=testfailed%2Cbusted%2Cexception%2Cretry%2Cusercancel&revision=d4c22a75fd6b4cc4949c51ae3692972779442b25

Failure log: https://treeherder.mozilla.org/logviewer?job_id=505457869&repo=autoland&lineNumber=20909

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c1636ff69141
Do not modify vendored drm headers r=pehrsons,media-playback-reviewers,stransky
https://hg.mozilla.org/integration/autoland/rev/a28e1eb69510
Regenerate moz.build files r=pehrsons,webrtc-reviewers
https://hg.mozilla.org/integration/autoland/rev/71615102de01
Update libdrm to 15e174c1ed2426be3228eb595f942481cfcf5a90 r=pehrsons

Comment 14

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/c1636ff69141
https://hg.mozilla.org/mozilla-central/rev/a28e1eb69510
https://hg.mozilla.org/mozilla-central/rev/71615102de01