Skip to content

Commit 9bcfa80

Browse files
rlmengerlmenge
authored
Enable DRM Acceleration and Intel VPU (#11692)
New feature. This enables the Intel VPU on x86_64. VPU stands for Versatile Processing Unit. This driver is used in the Intel Core Ultra processors to support their AI processing. This driver leans on the DRM Accel framework which requires the Direct Rendering Manager (DRM) subsystem. Since AI accelerators share many similarities with GPUs, they leverage the existing DRM infrastructure. Therefore as a result of [6e21f45] "Update CONFIG_DRM as loadable module and create sub-package for in-tree amdgpu modules", the accelerator drivers need to be packaged with the subpackage kernel-drivers-gpu. If in the generic kernel package, it will result in errors when insmod (without drm)
1 parent d34a0b1 commit 9bcfa80

13 files changed

Lines changed: 41 additions & 14 deletions

File tree

‎SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.64.2
10-
Release: 1%{?dist}
10+
Release: 2%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
109+
- Bump release to match kernel-64k
110+
108111
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
109112
- Auto-upgrade to 6.6.64.2
110113

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.64.2
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
149+
- Bump release to match kernel
150+
148151
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
149152
- Auto-upgrade to 6.6.64.2
150153

‎SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.64.2
9-
Release: 1%{?dist}
9+
Release: 2%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
72+
- Bump release to match kernel
73+
7174
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
7275
- Auto-upgrade to 6.6.64.2
7376

‎SPECS/kernel-64k/kernel-64k.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Summary: Linux Kernel
2626
Name: kernel-64k
2727
Version: 6.6.64.2
28-
Release: 1%{?dist}
28+
Release: 2%{?dist}
2929
License: GPLv2
3030
Vendor: Microsoft Corporation
3131
Distribution: Azure Linux
@@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
370370
%{_sysconfdir}/bash_completion.d/bpftool
371371

372372
%changelog
373+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
374+
- Bump release to match kernel
375+
373376
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
374377
- Auto-upgrade to 6.6.64.2
375378

‎SPECS/kernel-headers/kernel-headers.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.64.2
17-
Release: 1%{?dist}
17+
Release: 2%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
79+
- Bump release to match kernel
80+
7881
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
7982
- Auto-upgrade to 6.6.64.2
8083

‎SPECS/kernel/config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5018,7 +5018,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
50185018
# CONFIG_LOGO is not set
50195019
# end of Graphics support
50205020

5021-
# CONFIG_DRM_ACCEL is not set
5021+
CONFIG_DRM_ACCEL=y
5022+
# CONFIG_DRM_ACCEL_HABANALABS is not set
5023+
CONFIG_DRM_ACCEL_IVPU=m
50225024
CONFIG_SOUND=m
50235025
CONFIG_SND=m
50245026
CONFIG_SND_TIMER=m

‎SPECS/kernel/kernel-uki.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Summary: Unified Kernel Image
1414
Name: kernel-uki
1515
Version: 6.6.64.2
16-
Release: 1%{?dist}
16+
Release: 2%{?dist}
1717
License: GPLv2
1818
Vendor: Microsoft Corporation
1919
Distribution: Azure Linux
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7070
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7171

7272
%changelog
73+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
74+
- Bump release to match kernel
75+
7376
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
7477
- Auto-upgrade to 6.6.64.2
7578

‎SPECS/kernel/kernel.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config": "fc926acd06b82abc2a9f0618947072eba2e6913c5cbbf11d64aaf56e3f0996cc",
4+
"config": "d4cc7bd42d9791716b0065a61b50ac9319172fe10a71e2aec5307fe7f7382dca",
55
"config_aarch64": "27a07a9652c8dcfff7edb3134372dd0f53a9a6c8ab9c3dc5bf580ee08410bd27",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",

‎SPECS/kernel/kernel.spec‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.64.2
33-
Release: 1%{?dist}
33+
Release: 2%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -359,6 +359,7 @@ echo "initrd of kernel %{uname_r} removed" >&2
359359
%exclude /lib/modules/%{uname_r}/build
360360
%exclude /lib/modules/%{uname_r}/kernel/drivers/accessibility
361361
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu
362+
%exclude /lib/modules/%{uname_r}/kernel/drivers/accel
362363
%exclude /lib/modules/%{uname_r}/kernel/sound
363364

364365
%files docs
@@ -377,6 +378,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
377378
%files drivers-gpu
378379
%defattr(-,root,root)
379380
/lib/modules/%{uname_r}/kernel/drivers/gpu
381+
%ifarch x86_64
382+
/lib/modules/%{uname_r}/kernel/drivers/accel
383+
%endif
380384
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu/drm/amd
381385

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

426430
%changelog
431+
* Fri Jan 10 2025 Rachel Menge <rachelmenge@microsoft.com> - 6.6.64.2-2
432+
- Enable Intel VPU
433+
427434
* Thu Jan 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.64.2-1
428435
- Auto-upgrade to 6.6.64.2
429436

‎toolkit/resources/manifests/package/pkggen_core_aarch64.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.64.2-1.azl3.noarch.rpm
2+
kernel-headers-6.6.64.2-2.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

0 commit comments

Comments
 (0)