Skip to content

fix: update logic for applying framework laptop 13 fixes - #2972

Merged
hanthor merged 2 commits into
ublue-os:mainfrom
kreed:framework
Sep 5, 2025
Merged

fix: update logic for applying framework laptop 13 fixes#2972
hanthor merged 2 commits into
ublue-os:mainfrom
kreed:framework

Conversation

@kreed

@kreed kreed commented Aug 10, 2025

Copy link
Copy Markdown
Contributor

Two changes:

  1. The suspend workaround is specific to Framework 13 Ryzen 7040 but we're also applying it to the recently released Ryzen AI 300 models. These don't need the workaround.
  2. The 3.5mm jack workaround is needed for all Framework 13 models. The kernel code applies this workaround automatically for most current Intel/AMD framework models, but it's missing the new Ryzen AI 300. It doesn't seem to hurt to apply this workaround explicitly even when the kernel does it (we've been doing so for the Ryzen 7040 for some time now) so I loosened the condition to apply it to all models.

I've tested this on a Framework 13 Ryzen AI 300. If anyone could test on other Framework 13 models (especially the Ryzen 7040) that would be appreciated!

@dosubot dosubot Bot added size/M This PR changes 30-99 lines, ignoring generated files. framework Issue specicifc to Framework laptops labels Aug 10, 2025

@ledif ledif left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these changes! I tested with my Framework 13 7840U and it properly detected the machine and entered the correct branches.

We will need to port this to Aurora as well.

@kreed

kreed commented Sep 4, 2025

Copy link
Copy Markdown
Contributor Author

I added another commit that removes the modprobe flag for the headset jack. Background:

  1. The kernel level quirk is updated to detect AI 300 Framework 13's for 6.17. It's also in the stable releases (6.16.12, 6.15.11, and the LTS kernels too). So when using a new enough kernel the quirk should be automatically applied for all Framework 13 models.
  2. Did some reading on the framework forums and it seems the kernel-level quirk is actually slightly better than the modprobe one (dell-headset-multi can result in duplicate inputs showing up). https://community.frame.work/t/request-kernel-patch-for-the-dell-headset-multi-workaround/18222/6
  3. Internal audio controller on Framework 13 AMD Ryzen HX370 no longer recognised #2842 reported that removing the modprobe fixed the issue

Given all this, I think it makes sense to remove it. May want to hold off on merging this change until all the releases are using a kernel which includes the fix though.

@hanthor hanthor left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't test but if it works for @ledif it should work for us

@dosubot dosubot Bot added the lgtm This PR has been approved by a maintainer label Sep 5, 2025
@hanthor
hanthor enabled auto-merge September 5, 2025 10:17
@hanthor
hanthor added this pull request to the merge queue Sep 5, 2025
Merged via the queue into ublue-os:main with commit 1dd1cf5 Sep 5, 2025
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

framework Issue specicifc to Framework laptops lgtm This PR has been approved by a maintainer size/M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants