Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump kernel and m1n1 #41

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open

bump kernel and m1n1 #41

wants to merge 40 commits into from

Conversation

joske
Copy link

@joske joske commented Nov 25, 2023

This bumps kernel to asahi-6.6-14 and m1n1 to 1.4.11

Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@liberodark
Copy link

Hi,

Can you accept to upgrade package ? @marcan
If this work is ok.

Best Regards

Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@joske joske force-pushed the kernel branch 2 times, most recently from ac49f03 to 763985e Compare December 14, 2023 19:40
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@seeschloss
Copy link

I was wondering if HDMI out depends on this or something else. I've just tried to plug in a HDMI display and it doesn't work, but I haven't investigated anything further.

Have you tried to use HDMI on Arch yet, @joske?

@joske
Copy link
Author

joske commented Jan 4, 2024

on a laptop? It's not yet working.

@seeschloss
Copy link

It's supposed to work on laptops with HDMI ports (so no Airs) as far as I understand, it was announced here: https://social.treehouse.systems/@AsahiLinux/111515422125309592

@joske
Copy link
Author

joske commented Jan 4, 2024

I only have a M1 macbook air, so can't test. The kernel and m1n1 should be new enough, don't know what else could be missing.

@seeschloss
Copy link

Alright, I had not noticed yours was a Macbook Air, I'll try to see what I can do

@joske
Copy link
Author

joske commented Jan 24, 2024

@seeschloss there's a problem, all commits must have sign-offs and yours don't. Not sure if we can re-use the branch as is, I'll have to revert the merge. Can you then recreate your PR, this time with signed-off-by?

@liberodark
Copy link

liberodark commented Jan 24, 2024

@joske Thanks for the update but compilation fail on 6.6-15 :
https://paste.yunohost.org/baziqecisi.coffeescript

Workaround for me is to remove rust and install rustup.
After that run rustup default 1.71.1

@joske
Copy link
Author

joske commented Jan 24, 2024

@liberodark you can also use rustup override set 1.71.1 in the folder where you build

Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@joske
Copy link
Author

joske commented May 21, 2024

doh, fixed.

@mkurz
Copy link

mkurz commented May 22, 2024

For the record, you need to use the rust package, not rustup, see https://oftc.irclog.whitequark.org/asahi/2024-05-22#1716385343-1716387697;

@joske
Copy link
Author

joske commented May 22, 2024

I do not agree (I write rust for a living). The arch rust package will always have the latest stable version, while the kernel mandates a specific version (usually NOT latest). It's better to install rustup and set an override in the folder you build in to the recommended version.

I'll push a rust-toolchain file that matches the current supported rust version so this should happen automatically then.

@mkurz
Copy link

mkurz commented May 22, 2024

@joske ok, I have no experience with rust nor its toolchain so this is just what I picked up from the chat. Someone had problems compiling and switching from rustup to rust fixed that. For me this topic currently is more like "i have no idea what i am doing"...

@joske
Copy link
Author

joske commented May 22, 2024

hehe, I saw that you were using 1.78 to build your kernel, which surprised me as in the past, latest toolchain wouldn't build the kernel at all. I guess rust support in the kernel is improving quickly.

Anyway, I think it's best to compile with the recommended toolchain and bindgen.

@joske
Copy link
Author

joske commented May 22, 2024

To add to this, in the rust world, it's recommended to use rustup to install rust, as it supports multiple toolchains at the same time while the distro package manager can only have 1 version.

Also we have the override system (some projects mandate older rust versions while others may need nightly) to manage the toolchains. I usually need latest stable for work, but I also always need nightly as some clippy and rustfmt options require this

@joske
Copy link
Author

joske commented May 22, 2024

You can read about rustup here: https://rust-lang.github.io/rustup/index.html

@mkurz
Copy link

mkurz commented May 22, 2024

got it, so ´rustup` is basically like https://sdkman.io/ or node version manager to quickly install different rust versions in parallel and switch between them. Totally makes sense.

joske added 2 commits May 22, 2024 22:44
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@jannau
Copy link
Member

jannau commented May 22, 2024

we are somewhat committed to support the rust version in fedora which is updated quickly as well. If possible this is done without breaking the base version. Current asahi 6.8 tags support rust 1.76 - 1.78. bindgen is usually not a problem.

@dontdieych
Copy link

@mkurz @joske

whatever reason. I got gpu driver working by,

  • rustup -> rust
  • sync version of pkgs @mkurz mentioned

@dontdieych
Copy link

BTW, Thanks for keep managing PKGBUILDs!

@dontdieych
Copy link

  • git pull --all

  • ls rust-toolchain.toml
    rust-toolchain.toml

  • change rust -> rustup

  • uninstall bindgen(local by cargo. global is installed)

  • makepkg -cfsi on branch kernel

  • reboot

  • glxinfo | grep "OpenGL renderer"

  • OpenGL renderer string: Apple M2 (G14G B0)

@mkurz
Copy link

mkurz commented May 27, 2024

Question: I see the package depends on rust-bindgen. With pacman I now removed rust and replaced it with rustup.
Following messages appear:

--- ../config   2024-05-21 11:42:52.606068350 +0200
+++ build/base/.config  2024-05-27 14:19:16.439058591 +0200
@@ -275,7 +275,7 @@
 CONFIG_RUST=y
 CONFIG_RUSTC_VERSION_TEXT="rustc 1.76.0 (07dca489a 2024-02-04)"
 CONFIG_RUSTC_LLVM_VERSION_TEXT="17.0.6"
-CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.65.1"
+CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.69.4"
***
*** Rust bindings generator 'bindgen' is too new. This may or may not work.
***   Your version:     0.69.4
***   Expected version: 0.65.1
***
***
*** Please see Documentation/rust/quick-start.rst for details
*** on how to set up the Rust support.
***

Is this ok? Is it ok the package to depend on rust-bindgen (which when installed, installs the latest available version 0.69, whereas currently 0.65 is mentioned in the config). or should this bindgen stuff be also installed via cargo with a specific version 0.65?

Maybe everything is ok, just wondering.

@joske
Copy link
Author

joske commented May 27, 2024

Yes, this is mostly ok. As Jannau mentioned above too, the bindgen version is not that important, it tends to work with other versions so far. With cargo we could install the exact version, but this gives us a quick build dependency.

@dontdieych
Copy link

@mkurz

Yes it was same.

***
*** Rust bindings generator 'bindgen' is too new. This may or may not work.
***   Your version:     0.69.4
***   Expected version: 0.65.1
***
***
*** Please see Documentation/rust/quick-start.rst for details
*** on how to set up the Rust support

@mkurz
Copy link

mkurz commented May 28, 2024

Fedora now updated to 6.8.10:

This also fits this message from marcan: https://social.treehouse.systems/@marcan/112517012101266710

BTW: We can now very nicely see which commits they apply on top of the "vanilla" asahi-kernel here:

Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@gierens
Copy link

gierens commented May 30, 2024

Can confirm HDMI working on a MacBook M2 Pro (14-inch, 2023, J414) 🥳 ... Thanks @joske 🙏

Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Jos Dehaes <jos.dehaes@gmail.com>
@mkurz
Copy link

mkurz commented Jul 23, 2024

Please update to 6.9.10-1
Specially since asahi 6.9.7 is broken in regards of GPU: AsahiLinux/linux#309
(I am running the fixed 6.9.9 and issue is gone.)

@mkurz
Copy link

mkurz commented Jul 28, 2024

mkurz and others added 3 commits July 28, 2024 23:11
Signed-off-by: Matthias Kurz <m.kurz@irregular.at>
Signed-off-by: Matthias Kurz <m.kurz@irregular.at>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants