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

Enable DRM Acceleration and Intel VPU #11692

Merged
merged 2 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-64k-signed-%{buildarch}
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel-64k

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-signed/kernel-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -68,6 +68,9 @@ popd
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel-64k/kernel-64k.spec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Summary: Linux Kernel
Name: kernel-64k
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel-headers/kernel-headers.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -75,6 +75,9 @@ done
%endif

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
4 changes: 3 additions & 1 deletion SPECS/kernel/config
Original file line number Diff line number Diff line change
Expand Up @@ -5018,7 +5018,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_LOGO is not set
# end of Graphics support

# CONFIG_DRM_ACCEL is not set
CONFIG_DRM_ACCEL=y
# CONFIG_DRM_ACCEL_HABANALABS is not set
CONFIG_DRM_ACCEL_IVPU=m
CONFIG_SOUND=m
CONFIG_SND=m
CONFIG_SND_TIMER=m
Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel/kernel-uki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Summary: Unified Kernel Image
Name: kernel-uki
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Bump release to match kernel

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
2 changes: 1 addition & 1 deletion SPECS/kernel/kernel.signatures.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Signatures": {
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
"config": "fc926acd06b82abc2a9f0618947072eba2e6913c5cbbf11d64aaf56e3f0996cc",
"config": "d4cc7bd42d9791716b0065a61b50ac9319172fe10a71e2aec5307fe7f7382dca",
"config_aarch64": "27a07a9652c8dcfff7edb3134372dd0f53a9a6c8ab9c3dc5bf580ee08410bd27",
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
Expand Down
9 changes: 8 additions & 1 deletion SPECS/kernel/kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.6.64.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -359,6 +359,7 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /lib/modules/%{uname_r}/build
%exclude /lib/modules/%{uname_r}/kernel/drivers/accessibility
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu
%exclude /lib/modules/%{uname_r}/kernel/drivers/accel
%exclude /lib/modules/%{uname_r}/kernel/sound

%files docs
Expand All @@ -377,6 +378,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%files drivers-gpu
%defattr(-,root,root)
/lib/modules/%{uname_r}/kernel/drivers/gpu
%ifarch x86_64
/lib/modules/%{uname_r}/kernel/drivers/accel
%endif
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu/drm/amd

%files drivers-intree-amdgpu
Expand Down Expand Up @@ -424,6 +428,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Fri Jan 10 2025 Rachel Menge <[email protected]> - 6.6.64.2-2
- Enable Intel VPU

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.aarch64.rpm
kernel-headers-6.6.64.2-1.azl3.noarch.rpm
kernel-headers-6.6.64.2-2.azl3.noarch.rpm
glibc-2.38-8.azl3.aarch64.rpm
glibc-devel-2.38-8.azl3.aarch64.rpm
glibc-i18n-2.38-8.azl3.aarch64.rpm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.x86_64.rpm
kernel-headers-6.6.64.2-1.azl3.noarch.rpm
kernel-headers-6.6.64.2-2.azl3.noarch.rpm
glibc-2.38-8.azl3.x86_64.rpm
glibc-devel-2.38-8.azl3.x86_64.rpm
glibc-i18n-2.38-8.azl3.x86_64.rpm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.aarch64.rpm
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
kernel-headers-6.6.64.2-1.azl3.noarch.rpm
kernel-headers-6.6.64.2-2.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.x86_64.rpm
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
kernel-cross-headers-6.6.64.2-1.azl3.noarch.rpm
kernel-headers-6.6.64.2-1.azl3.noarch.rpm
kernel-cross-headers-6.6.64.2-2.azl3.noarch.rpm
kernel-headers-6.6.64.2-2.azl3.noarch.rpm
kmod-30-1.azl3.x86_64.rpm
kmod-debuginfo-30-1.azl3.x86_64.rpm
kmod-devel-30-1.azl3.x86_64.rpm
Expand Down
Loading