diff options
53 files changed, 633 insertions, 1949 deletions
diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 2ed8af05..00000000 --- a/CHANGELOG +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | This file will only list major changes that occur within a release. | ||
2 | For a full list of changes, view the git log of the repository. | ||
3 | |||
4 | Rocko Release 11/2017 | ||
5 | ===================== | ||
6 | |||
7 | Moved qat support to separate layer | ||
8 | ----------------------------------- | ||
9 | Quick Assist Technology (QAT) is more middleware and should not be part of the | ||
10 | core BSP. The new layer can be found here: | ||
11 | https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-qat/ | ||
12 | |||
13 | Moved dpdk support to separate layer | ||
14 | ------------------------------------ | ||
15 | We had some requests to make DPDK standalone so that it could be included | ||
16 | without bringing in anything else from meta-intel, as it is not specific to | ||
17 | Intel(R) hardware. The new layer is located here: | ||
18 | https://git.yoctoproject.org/cgit/cgit.cgi/meta-dpdk/ | ||
19 | |||
20 | Added support for out-of-tree iwlwifi drivers | ||
21 | --------------------------------------------- | ||
22 | Backport-iwlwifi out-of-tree wifi modules are now available via meta-intel. | ||
23 | Backport-iwlwifi brings the latest iwlwifi drivers to almost any kernel | ||
24 | Note that mac80211 and cfg80211 backports are also necessary, which will most | ||
25 | likely cause incompatibility with other in-tree wifi drivers. | ||
26 | See https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi for more info. | ||
27 | |||
28 | Added support for out-of-tree ixgbe drivers | ||
29 | ------------------------------------------- | ||
30 | The out-of-tree ixgbe drivers bring ixgbe support to nearly any kernel. See | ||
31 | here: http://www.intel.com/network/connectivity/products/server_adapters.htm | ||
32 | |||
33 | Added an implementation of Secure Boot | ||
34 | -------------------------------------- | ||
35 | meta-intel now supports a simple Secure Boot implementation. This implementation | ||
36 | consists of a single binary consisting of an EFI stub, the kernel, an | ||
37 | initrd, and a kernel command line. The binary is then signed via keys defined by | ||
38 | the variables SECUREBOOT_SIGNING_KEY and SECUREBOOT_SIGNING_CERT. These keys | ||
39 | should match the keys embedded in your hardware's firmware. | ||
40 | See documentation/secureboot/README for more information on this feature. | ||
41 | |||
42 | Improved Yocto Project Compatibility status | ||
43 | ------------------------------------------- | ||
44 | The common layer should now be considered Yocto Project compatible - it should | ||
45 | no longer modify OE-core values when adding the layer to your bblayers.conf. | ||
46 | The meta-tlk layer is still not Yocto Project compatible, however. | ||
47 | |||
48 | Pyro Release 5/2017 | ||
49 | =================== | ||
50 | |||
51 | Changed default kernel provider from linux-yocto to linux-intel. | ||
52 | ---------------------------------------------------------------- | ||
53 | Linux-intel is an Intel(R)-maintained kernel based on the latest stable | ||
54 | branch, along with backports from upstream to better support Intel(R) | ||
55 | hardware. The intel-linux kernel also has a branch with the preempt-rt | ||
56 | patches applied, providing a preempt-rt kernel with no additional work. | ||
57 | |||
58 | Added QEMU support. | ||
59 | ------------------- | ||
60 | We now build several virtio drivers into the kernel by default, and | ||
61 | have qemuboot.conf files for intel-corei7-64 and intel-core2-32 | ||
62 | targets. This allows one to do basic testing on meta-intel images | ||
63 | without having to use hardware. The virtio drivers are added via | ||
64 | KERNEL_FEATURES_INTEL_COMMON. This prevents them from being added to | ||
65 | custom kernels by default. They can be removed by adding the | ||
66 | following to a conf or kernel bbappend file: | ||
67 | KERNEL_FEATURES_INTEL_COMMON:remove = “cfg/virtio.scc” | ||
68 | OVMF firmware is also built and can be used in order to emulate a UEFI | ||
69 | environment. A full runqemu command line for intel-corei7-64 could look | ||
70 | like this: | ||
71 | runqemu core-image-minimal intel-corei7-64 wic ovmf | ||
72 | |||
73 | Musl support | ||
74 | ------------ | ||
75 | Meta-intel is now compatible with the musl C library. You can specify musl | ||
76 | As your C library by adding the following to your local.conf: | ||
77 | TCLIBC = “musl” | ||
78 | Note: there is a known failure with DPDK. | ||
79 | |||
80 | X32 support | ||
81 | ----------- | ||
82 | The meta-intel layer can now build with the x32 tune settings in a multi-lib | ||
83 | setting, it will not work in as the primary MACHINE tune as the bootloader needs | ||
84 | to be built as a 64bit binary. The setup for this would be as follows: | ||
85 | require conf/multilib.conf | ||
86 | MULTILIBS = "multilib:libx32 | ||
87 | DEFAULTTUNE:virtclass-multilib-libx32 = "corei7-64-x32" | ||
diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 73a9fe3a..00000000 --- a/MAINTAINERS +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | This file contains a list of BSP maintainers for the BSPs contained in | ||
2 | the meta-intel repository. | ||
3 | |||
4 | The purpose of this file is to provide contact information for | ||
5 | specific BSPs and other code contained within meta-intel. You should | ||
6 | address questions and patches for a particular BSP or other code to | ||
7 | the appropriate maintainer listed in this file, cc'ing the meta-intel | ||
8 | mailing list. This ensures that your question or patch will be | ||
9 | addressed by the appropriate person, and that it will be seen by other | ||
10 | users who may be facing similar problems or questions. | ||
11 | |||
12 | Please see the top-level README file for guidelines relating to the | ||
13 | details of submitting patches, reporting problems, or asking questions | ||
14 | about any of the BSPs or other recipes contained within meta-intel. | ||
15 | |||
16 | Descriptions of section entries: | ||
17 | |||
18 | M: Mail patches to: FullName <address@domain> | ||
19 | F: Files and directories with wildcard patterns. | ||
20 | A trailing slash includes all files and subdirectory files. | ||
21 | F: common/ all files in and below common | ||
22 | F: common/* all files in common, but not below | ||
23 | One pattern per line. Multiple F: lines acceptable. | ||
24 | |||
25 | Please keep this list in alphabetical order. | ||
26 | |||
27 | Maintainers List (try to look for most precise areas first) | ||
28 | |||
29 | ----------------------------------- | ||
30 | |||
31 | M: Anuj Mittal <anuj.mittal@intel.com> | ||
32 | F: * | ||
diff --git a/README b/README deleted file mode 100644 index ca2c5041..00000000 --- a/README +++ /dev/null | |||
@@ -1,470 +0,0 @@ | |||
1 | meta-intel | ||
2 | ========== | ||
3 | |||
4 | This README file contains information on building and booting | ||
5 | meta-intel BSP layers. Please see the corresponding sections below | ||
6 | for details. | ||
7 | |||
8 | |||
9 | Yocto Project Compatible | ||
10 | ======================== | ||
11 | |||
12 | The BSPs contained in this layer are compatible with the Yocto Project | ||
13 | as per the requirements listed here: | ||
14 | |||
15 | https://www.yoctoproject.org/webform/yocto-project-compatible-registration | ||
16 | |||
17 | |||
18 | Dependencies | ||
19 | ============ | ||
20 | |||
21 | This layer depends on: | ||
22 | |||
23 | URI: git://git.openembedded.org/bitbake | ||
24 | |||
25 | URI: git://git.openembedded.org/openembedded-core | ||
26 | layers: meta | ||
27 | branch: master | ||
28 | |||
29 | |||
30 | Table of Contents | ||
31 | ================= | ||
32 | |||
33 | I. Overview | ||
34 | II. Building and booting meta-intel BSP layers | ||
35 | a. Building the intel-common BSP layers | ||
36 | b. Booting the intel-common BSP images | ||
37 | c. Building the installer image | ||
38 | III. Technical Miscellany | ||
39 | Benefits of using meta-intel | ||
40 | The intel-common kernel package architecture | ||
41 | Intel-specific machine features | ||
42 | IV. Tested Hardware | ||
43 | V. Guidelines for submitting patches | ||
44 | |||
45 | |||
46 | I. Overview | ||
47 | =========== | ||
48 | |||
49 | This is the location for Intel-maintained BSPs. | ||
50 | |||
51 | For details on the intel-common, see the information below. | ||
52 | |||
53 | For all others, please see the README files contained in the | ||
54 | individual BSP layers for BSP-specific information. | ||
55 | |||
56 | If you have problems with or questions about a particular BSP, please | ||
57 | contact the maintainer listed in the MAINTAINERS file directly (cc:ing | ||
58 | the Yocto mailing list puts it in the archive and helps other people | ||
59 | who might have the same questions in the future), but please try to do | ||
60 | the following first: | ||
61 | |||
62 | - look in the Yocto Project Bugzilla | ||
63 | (http://bugzilla.yoctoproject.org/) to see if a problem has | ||
64 | already been reported | ||
65 | |||
66 | - look through recent entries of the meta-intel | ||
67 | (https://lists.yoctoproject.org/pipermail/meta-intel/) and Yocto | ||
68 | (https://lists.yoctoproject.org/pipermail/yocto/) mailing list | ||
69 | archives to see if other people have run into similar problems or | ||
70 | had similar questions answered. | ||
71 | |||
72 | If you believe you have encountered a bug, you can open a new bug and | ||
73 | enter the details in the Yocto Project Bugzilla | ||
74 | (http://bugzilla.yoctoproject.org/). If you're relatively certain | ||
75 | that it's a bug against the BSP itself, please use the 'Yocto Project | ||
76 | Components: BSPs | meta-intel' category for the bug; otherwise, please | ||
77 | submit the bug against the most likely category for the problem - if | ||
78 | you're wrong, it's not a big deal and the bug will be recategorized | ||
79 | upon triage. | ||
80 | |||
81 | |||
82 | II. Building and booting meta-intel BSP layers | ||
83 | ============================================== | ||
84 | |||
85 | The following sections contain information on building and booting the | ||
86 | BSPs contained in the meta-intel layer. | ||
87 | |||
88 | Note that these instructions specifically cover the intel-common, which | ||
89 | may or may not be applicable to other BSPs contained in this layer - if | ||
90 | a given BSP contains its own README, that version should be used instead, | ||
91 | and these instructions can be ignored. | ||
92 | |||
93 | a. Building the intel-common BSP layers | ||
94 | ------------------------------------------------- | ||
95 | |||
96 | In order to build an image with BSP support for a given release, you | ||
97 | need to download the corresponding BSP tarball from the 'Board Support | ||
98 | Package (BSP) Downloads' page of the Yocto Project website (or | ||
99 | equivalently, check out the appropriate branch from the meta-intel git | ||
100 | repository, see below). For the intel-common BSPs, those tarballs would | ||
101 | correspond to the following choices in the BSP downloads section: | ||
102 | |||
103 | - Intel-core2-32 Intel® Common Core BSP (Intel-core2-32) | ||
104 | - Intel-corei7-64 Intel® Common Core BSP (Intel-corei7-64) | ||
105 | |||
106 | The intel-* BSPs, also known as the intel-common BSPs, provide a few | ||
107 | carefully selected tune options and generic hardware support to cover | ||
108 | the majority of current Intel CPUs and devices. The naming follows the | ||
109 | convention of intel-<TUNE>-<BITS>, where TUNE is the gcc cpu-type | ||
110 | (used with mtune and march typically) and BITS is either 32 bit or 64 | ||
111 | bit. | ||
112 | |||
113 | Having done that, and assuming you extracted the BSP tarball contents | ||
114 | at the top-level of your yocto build tree, you can build a BSP image | ||
115 | by adding the location of the meta-intel layer to bblayers.conf e.g.: | ||
116 | |||
117 | yocto/meta-intel \ | ||
118 | |||
119 | To enable a particular machine, you need to add a MACHINE line naming | ||
120 | the BSP to the local.conf file: | ||
121 | |||
122 | MACHINE ?= "xxx" | ||
123 | |||
124 | where 'xxx' is replaced by one of the following BSP names: | ||
125 | |||
126 | - intel-core2-32 | ||
127 | |||
128 | This BSP is optimized for the Core2 family of CPUs as well as all | ||
129 | Atom CPUs prior to the Silvermont core. | ||
130 | |||
131 | - intel-corei7-64 | ||
132 | |||
133 | This BSP is optimized for Nehalem and later Core and Xeon CPUs as | ||
134 | well as Silvermont and later Atom CPUs, such as the Baytrail SoCs. | ||
135 | |||
136 | You should then be able to build an image as such: | ||
137 | |||
138 | $ source oe-init-build-env | ||
139 | $ bitbake core-image-sato | ||
140 | |||
141 | At the end of a successful build, you should have an image that | ||
142 | you can boot from a USB flash drive (see instructions on how to do | ||
143 | that below, in the section 'Booting the intel-common BSP images'). | ||
144 | |||
145 | As an alternative to downloading the BSP tarball, you can also work | ||
146 | directly from the meta-intel git repository. For each BSP in the | ||
147 | 'meta-intel' repository, there are multiple branches, one | ||
148 | corresponding to each major release starting with 'laverne' (0.90), in | ||
149 | addition to the latest code which tracks the current master (note that | ||
150 | not all BSPs are present in every release). Instead of extracting | ||
151 | a BSP tarball at the top level of your yocto build tree, you can | ||
152 | equivalently check out the appropriate branch from the meta-intel | ||
153 | repository at the same location. | ||
154 | |||
155 | b. Booting the intel-common BSP images | ||
156 | -------------------------------------- | ||
157 | |||
158 | If you've built your own image, either from the downloaded BSP layer | ||
159 | or from the meta-intel git repository, you'll find the bootable | ||
160 | image in the build/tmp/deploy/images/xxx directory, where again | ||
161 | 'xxx' refers to the machine name used in the build. | ||
162 | |||
163 | Under Linux, insert a USB flash drive. Assuming the USB flash drive | ||
164 | takes device /dev/sdf, use dd to copy the image to it. Before the image | ||
165 | can be burned onto a USB drive, it should be un-mounted. Some Linux distros | ||
166 | may automatically mount a USB drive when it is plugged in. Using USB device | ||
167 | /dev/sdf as an example, find all mounted partitions: | ||
168 | |||
169 | $ mount | grep sdf | ||
170 | |||
171 | and un-mount those that are mounted, for example: | ||
172 | |||
173 | $ umount /dev/sdf1 | ||
174 | $ umount /dev/sdf2 | ||
175 | |||
176 | Now burn the image onto the USB drive: | ||
177 | |||
178 | $ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress | ||
179 | $ sync | ||
180 | $ eject /dev/sdf | ||
181 | |||
182 | This should give you a bootable USB flash device. Insert the device | ||
183 | into a bootable USB socket on the target, and power on. This should | ||
184 | result in a system booted to the Sato graphical desktop. | ||
185 | |||
186 | If you want a terminal, use the arrows at the top of the UI to move to | ||
187 | different pages of available applications, one of which is named | ||
188 | 'Terminal'. Clicking that should give you a root terminal. | ||
189 | |||
190 | If you want to ssh into the system, you can use the root terminal to | ||
191 | ifconfig the IP address and use that to ssh in. The root password is | ||
192 | empty, so to log in type 'root' for the user name and hit 'Enter' at | ||
193 | the Password prompt: and you should be in. | ||
194 | |||
195 | If you find you're getting corrupt images on the USB (it doesn't show | ||
196 | the syslinux boot: prompt, or the boot: prompt contains strange | ||
197 | characters), try doing this first: | ||
198 | |||
199 | $ dd if=/dev/zero of=/dev/sdf bs=1M count=512 | ||
200 | |||
201 | c. Building the installer image | ||
202 | ----------------------------------------------- | ||
203 | |||
204 | If you plan to install your image to your target machine, you can build a wic | ||
205 | based installer image instead of default wic image. To build it, you need to | ||
206 | add below configuration to local.conf : | ||
207 | |||
208 | WKS_FILE = "image-installer.wks.in" | ||
209 | IMAGE_FSTYPES:append = " ext4" | ||
210 | IMAGE_TYPEDEP:wic = "ext4" | ||
211 | INITRD_IMAGE_LIVE="core-image-minimal-initramfs" | ||
212 | do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete" | ||
213 | do_rootfs[depends] += "virtual/kernel:do_deploy" | ||
214 | IMAGE_BOOT_FILES:append = "\ | ||
215 | ${KERNEL_IMAGETYPE} \ | ||
216 | microcode.cpio \ | ||
217 | ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.rootfs.ext4;rootfs.img \ | ||
218 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
219 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \ | ||
220 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
221 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \ | ||
222 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} " | ||
223 | |||
224 | Burn the wic image onto USB flash device, insert the device to target machine | ||
225 | and power on. This should start the installation process. | ||
226 | |||
227 | III. Technical Miscellany | ||
228 | ========================= | ||
229 | |||
230 | Benefits of using meta-intel | ||
231 | ---------------------------- | ||
232 | |||
233 | Using meta-intel has the following benefits over a generic BSP: | ||
234 | |||
235 | tune flags | ||
236 | ++++++++++ | ||
237 | intel-* MACHINEs each have different compilation flags appropriate for their | ||
238 | targeted hardware sets. intel-corei7-64 has tune flags appropriate for modern | ||
239 | 64-bit Intel Core i microarchitecture, and includes instruction sets up to | ||
240 | SSE4.2. intel-core2-32 has tune flags appropriate for legacy 32-bit Intel Core2 | ||
241 | microarchitecture, and includes instruction sets up to SSE3. | ||
242 | |||
243 | linux-intel kernel | ||
244 | ++++++++++++++++++ | ||
245 | The linux-intel kernel is an initiative to bring better Intel(R) hardware | ||
246 | support to the current LTS linux kernel. It contains a base LTS kernel with | ||
247 | additional backports from upstream Intel drivers. In addition, a default kernel | ||
248 | config containing most features found on Intel boards is supplied via the | ||
249 | yocto-kernel-cache. | ||
250 | |||
251 | graphics stack | ||
252 | ++++++++++++++ | ||
253 | Meta-intel provides the latest Intel Graphics Linux Stack drivers to support | ||
254 | Intel hardware as defined by the https://01.org/linuxgraphics. | ||
255 | |||
256 | Other software | ||
257 | ++++++++++++++ | ||
258 | * intel ucode - provides the latest microcode updates for Intel processors | ||
259 | |||
260 | * thermald - which proactively controls thermal, using P-states, T-states, and | ||
261 | the Intel power clamp driver. | ||
262 | (https://01.org/linux-thermal-daemon/documentation/introduction-thermal-daemon) | ||
263 | |||
264 | The intel-common kernel package architecture | ||
265 | -------------------------------------------- | ||
266 | |||
267 | These BSPs use what we call the intel-common Linux kernel package | ||
268 | architecture. This includes core2-32-intel-common and | ||
269 | corei7-64-intel-common. These kernel packages can also be used by any | ||
270 | of the BSPs in meta-intel that choose to include the | ||
271 | intel-common-pkgarch.inc file. | ||
272 | |||
273 | To minimize the proliferation of vendor trees, reduce the sources we | ||
274 | must support, and consolidate QA efforts, all BSP maintainers are | ||
275 | encouraged to make use of the intel-common Linux kernel package | ||
276 | architecture. | ||
277 | |||
278 | Intel-specific machine features | ||
279 | ------------------------------- | ||
280 | |||
281 | The meta-intel layer makes some additional machine features available | ||
282 | to BSPs. These machine features can be used in a BSP layer in the | ||
283 | same way that machine features are used in other layers based on | ||
284 | oe-core, via the MACHINE_FEATURES variable. | ||
285 | |||
286 | Requirements | ||
287 | ++++++++++++ | ||
288 | |||
289 | The meta-intel-specific machine features are only available to a BSP | ||
290 | when the meta-intel layer is included in the build configuration, and | ||
291 | the meta-intel.inc file is included in the machine configuration of | ||
292 | that BSP. | ||
293 | |||
294 | To make these features available for your machine, you will need to: | ||
295 | |||
296 | 1. include a configuration line such as the below in bblayers.conf | ||
297 | BBLAYERS += "<local path>/meta-intel" | ||
298 | 2. include the following line in the machine configuration file | ||
299 | require conf/machine/include/meta-intel.inc | ||
300 | |||
301 | Once the above requirements are met, the machine features provided by | ||
302 | the meta-intel layer will be available for the BSP to use. | ||
303 | |||
304 | Available machine features | ||
305 | ++++++++++++++++++++++++++ | ||
306 | |||
307 | Currently, the meta-intel layer makes the following set of | ||
308 | Intel-specific machine features available: | ||
309 | |||
310 | * intel-ucode | ||
311 | |||
312 | These machine features can be included by listing them in the | ||
313 | MACHINE_FEATURES variable in the machine configuration file. For | ||
314 | example: | ||
315 | |||
316 | MACHINE_FEATURES += "intel-ucode" | ||
317 | |||
318 | Machine feature details | ||
319 | +++++++++++++++++++++++ | ||
320 | |||
321 | * intel-ucode | ||
322 | |||
323 | This feature provides support for microcode updates to Intel | ||
324 | processors. The intel-ucode feature runs at early boot and uses | ||
325 | the microcode data file added by the feature into the BSP's | ||
326 | initrd. It also puts the userland microcode-updating tool, | ||
327 | iucode_tool, into the target images along with the microcode data | ||
328 | file. | ||
329 | |||
330 | Q. Why might a user want to enable the intel-ucode feature? | ||
331 | |||
332 | A. Intel releases microcode updates to correct processor behavior | ||
333 | as documented in the respective processor specification | ||
334 | updates. While the normal approach to getting such microcode | ||
335 | updates is via a BIOS upgrade, this can be an administrative | ||
336 | hassle and not always possible in the field. The intel-ucode | ||
337 | feature enables the microcode update capability present in the | ||
338 | Linux kernel. It provides an easy path for upgrading processor | ||
339 | microcode without the need to change the BIOS. If the feature | ||
340 | is enabled, it is also possible to update the existing target | ||
341 | images with a newer microcode update in the future. | ||
342 | |||
343 | Q. How would a user bundle only target-specific microcode in the | ||
344 | target image? | ||
345 | |||
346 | A. The Intel microcode data file released by Intel contains | ||
347 | microcode updates for multiple processors. If the BSP image is | ||
348 | meant to run on only a certain subset of processor types, a | ||
349 | processor-specific subset of microcode can be bundled into the | ||
350 | target image via the UCODE_FILTER_PARAMETERS variable. This | ||
351 | works by listing a sequence of iucode-tool parameters in the | ||
352 | UCODE_FILTER_PARAMETERS variable, which in this case will | ||
353 | select only the specific microcode relevant to the BSP. For | ||
354 | more information on the underlying parameters refer to the | ||
355 | iucode-tool manual page at http://manned.org/iucode-tool | ||
356 | |||
357 | To define a set of parameters for microcode-filtering via the | ||
358 | UCODE_FILTER_PARAMETERS variable, one needs to identify the | ||
359 | cpuid signatures of all the processors the BSP is meant to run | ||
360 | on. One way to determine the cpuid signature for a specific | ||
361 | processor is to build and run an intel-ucode-feature-enabled | ||
362 | image on the target hardware, without first assigning any value | ||
363 | to the UCODE_FILTER_PARAMETERS variable, and then once the | ||
364 | image is booted, run the "ucode_tool -S" command to have the | ||
365 | ucode tool scan the system for processor signatures. These | ||
366 | signatures can then be used in the UCODE_FILTER_PARAMETERS | ||
367 | variable in conjunction with -s parameter. For example, for | ||
368 | the fri2 BSP, the cpuid can be determined as such: | ||
369 | |||
370 | [root@fri2 ~]# iucode_tool -S | ||
371 | iucode_tool: system has processor(s) with signature 0x00020661 | ||
372 | |||
373 | Given that output, a suitable UCODE_FILTER_PARAMETERS variable | ||
374 | definition could be specified in the machine configuration as | ||
375 | such: | ||
376 | |||
377 | UCODE_FILTER_PARAMETERS = "-s 0x00020661" | ||
378 | |||
379 | Q. Are there any reasons a user might want to disable the | ||
380 | intel-ucode feature? | ||
381 | |||
382 | A. The microcode data file and associated tools occupy a small | ||
383 | amount of space (a few KB) on the target image. BSPs which are | ||
384 | highly sensitive to target image size and which are not | ||
385 | experiencing microcode-related issues might consider not | ||
386 | enabling this feature. | ||
387 | |||
388 | |||
389 | IV. Tested Hardware | ||
390 | =================== | ||
391 | |||
392 | The following undergo regular basic testing with their respective MACHINE types. | ||
393 | Note that both 64-bit and 32-bit firmware is available for the MinnowBoard | ||
394 | Turbot, so it is tested against both intel-corei7-64 and intel-core2-32. | ||
395 | |||
396 | intel-corei7-64: | ||
397 | Alder Lake-P | ||
398 | Alder Lake-S | ||
399 | Elkhart Lake | ||
400 | Kaby Lake | ||
401 | Raptor Lake-P | ||
402 | Tiger Lake | ||
403 | |||
404 | intel-skylake-64: | ||
405 | Alder Lake-P | ||
406 | Alder Lake-S | ||
407 | Elkhart Lake | ||
408 | Kaby Lake | ||
409 | Raptor Lake-P | ||
410 | Tiger Lake | ||
411 | |||
412 | intel-core2-32: | ||
413 | MinnowBoard Turbot | ||
414 | |||
415 | |||
416 | V. Guidelines for submitting patches | ||
417 | ==================================== | ||
418 | |||
419 | Please submit any patches against meta-intel BSPs to the meta-intel | ||
420 | mailing list (meta-intel@lists.yoctoproject.org). Also, if your patches are | ||
421 | available via a public git repository, please also include a URL to | ||
422 | the repo and branch containing your patches as that makes it easier | ||
423 | for maintainers to grab and test your patches. | ||
424 | |||
425 | There are patch submission scripts available that will, among other | ||
426 | things, automatically include the repo URL and branch as mentioned. | ||
427 | Please see the Yocto Project Development Manual sections entitled | ||
428 | 'Using Scripts to Push a Change Upstream and Request a Pull' and | ||
429 | 'Using Email to Submit a Patch' for details. | ||
430 | |||
431 | Regardless of how you submit a patch or patchset, the patches should | ||
432 | at minimum follow the suggestions outlined in the 'Submitting a Change | ||
433 | to the Yocto Project' section in the Yocto Project Development Manual. | ||
434 | Specifically, they should: | ||
435 | |||
436 | - Include a 'Signed-off-by:' line. A commit can't legally be pulled | ||
437 | in without this. | ||
438 | |||
439 | - Provide a single-line, short summary of the change. This short | ||
440 | description should be prefixed by the BSP or recipe name, as | ||
441 | appropriate, followed by a colon. Capitalize the first character | ||
442 | of the summary (following the colon). | ||
443 | |||
444 | - For the body of the commit message, provide detailed information | ||
445 | that describes what you changed, why you made the change, and the | ||
446 | approach you used. | ||
447 | |||
448 | - If the change addresses a specific bug or issue that is associated | ||
449 | with a bug-tracking ID, include a reference to that ID in your | ||
450 | detailed description in the following format: [YOCTO #<bug-id>]. | ||
451 | |||
452 | - Pay attention to line length - please don't allow any particular | ||
453 | line in the commit message to stretch past 72 characters. | ||
454 | |||
455 | - For any non-trivial patch, provide information about how you | ||
456 | tested the patch, and for any non-trivial or non-obvious testing | ||
457 | setup, provide details of that setup. | ||
458 | |||
459 | Doing a quick 'git log' in meta-intel will provide you with many | ||
460 | examples of good example commits if you have questions about any | ||
461 | aspect of the preferred format. | ||
462 | |||
463 | The meta-intel maintainers will do their best to review and/or pull in | ||
464 | a patch or patchset within 24 hours of the time it was posted. For | ||
465 | larger and/or more involved patches and patchsets, the review process | ||
466 | may take longer. | ||
467 | |||
468 | Please see the meta-intel/MAINTAINERS file for the list of maintainers | ||
469 | and their specific areas; it's also a good idea to cc: the specific | ||
470 | maintainer, if applicable. | ||
diff --git a/README.md b/README.md new file mode 100644 index 00000000..91577f1d --- /dev/null +++ b/README.md | |||
@@ -0,0 +1,36 @@ | |||
1 | # meta-intel | ||
2 | |||
3 | OpenEmbedded/Yocto BSP layer for Intel platforms. | ||
4 | |||
5 | ## Dependencies | ||
6 | |||
7 | This layer primarily depends on OpenEmbedded-Core (OE-Core). However, certain | ||
8 | recipes may require additional layers to support optional features or | ||
9 | programming languages not supported by OE-Core. Such recipes are located within | ||
10 | the `dynamic-layers` directory. | ||
11 | |||
12 | Base dependencies: | ||
13 | - [Bitbake](https://git.openembedded.org/bitbake) | ||
14 | - [OE-Core](https://git.openembedded.org/openembedded-core) | ||
15 | |||
16 | Dynamic additional dependencies: | ||
17 | |||
18 | - [meta-openembedded](https://git.openembedded.org/meta-openembedded/tree/meta-oe) | ||
19 | - [meta-python](https://git.openembedded.org/meta-openembedded/tree/meta-python) | ||
20 | - [meta-clang](https://github.com/kraj/meta-clang.git) | ||
21 | |||
22 | |||
23 | ## Contents | ||
24 | |||
25 | - [Building and booting meta-intel BSP layers](documentation/building_and_booting.md) | ||
26 | - [Intel oneAPI DPC++/C++ Compiler](documentation/dpcpp-compiler.md) | ||
27 | - [Build Image with OpenVINO™ toolkit](documentation/openvino.md) | ||
28 | - [Tested Hardware](documentation/tested_hardware.md) | ||
29 | - [Guidelines for submitting patches](documentation/submitting_patches.md) | ||
30 | - [Reporting bugs](documentation/reporting_bugs.md) | ||
31 | - [Reporting security bugs](SECURITY.md) | ||
32 | |||
33 | ## Maintainers | ||
34 | |||
35 | - Anuj Mittal <anuj.mittal@intel.com> | ||
36 | |||
diff --git a/documentation/building_and_booting.md b/documentation/building_and_booting.md new file mode 100644 index 00000000..478a4fb0 --- /dev/null +++ b/documentation/building_and_booting.md | |||
@@ -0,0 +1,134 @@ | |||
1 | ### Building the Intel BSP layers | ||
2 | |||
3 | The intel-common BSP provide a few carefully selected tune options and | ||
4 | generic hardware support to cover the majority of current Intel CPUs and | ||
5 | devices. The naming follows the convention of intel-<TUNE>-<BITS>, where | ||
6 | TUNE is the gcc cpu-type (used with mtune and march typically) and BITS | ||
7 | is either 32 bit or 64 bit. | ||
8 | |||
9 | In order to build an image with BSP support for a given release, you | ||
10 | need to clone the meta-intel layer from git repository: | ||
11 | ``` | ||
12 | git clone https://git.yoctoproject.org/meta-intel | ||
13 | ``` | ||
14 | |||
15 | Check out the appropriate branch or release tags. The branch name and tags | ||
16 | would align with Yocto Project | ||
17 | [Release Codenames](https://wiki.yoctoproject.org/wiki/Releases). | ||
18 | Assuming meta-intel repository is cloned at the top-level of | ||
19 | OE-Core build tree, you can build a BSP image by adding the location of | ||
20 | the meta-intel layer to bblayers.conf: | ||
21 | ``` | ||
22 | BBLAYERS = " \ | ||
23 | /openembedded-core/meta \ | ||
24 | /openembedded-core/meta-intel " | ||
25 | ``` | ||
26 | |||
27 | To enable a particular machine, add a MACHINE line naming the BSP | ||
28 | to the local.conf file: | ||
29 | ``` | ||
30 | MACHINE ?= "intel-corei7-64" | ||
31 | ``` | ||
32 | |||
33 | where this can be replaced by other MACHINE types available: | ||
34 | |||
35 | - intel-core2-32 | ||
36 | |||
37 | This BSP is optimized for the Core2 family of CPUs as well as all | ||
38 | Atom CPUs prior to the Silvermont core. | ||
39 | |||
40 | - intel-corei7-64 | ||
41 | |||
42 | This BSP is optimized for Nehalem and later Core and Xeon CPUs as | ||
43 | well as Silvermont and later Atom CPUs, such as the Baytrail SoCs. | ||
44 | |||
45 | - intel-skylake-64 | ||
46 | |||
47 | This BSP uses [x86-64-v3 tuning](https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html). | ||
48 | |||
49 | You should then be able to build an image as such: | ||
50 | ``` | ||
51 | $ source oe-init-build-env | ||
52 | $ bitbake core-image-sato | ||
53 | ``` | ||
54 | |||
55 | At the end of a successful build, you should have an image that | ||
56 | you can boot from a USB flash drive. | ||
57 | |||
58 | |||
59 | ## Booting the intel-common BSP images | ||
60 | |||
61 | If you've built your own image, you'll find the bootable | ||
62 | image in the build/tmp/deploy/images/{MACHINE} directory, where | ||
63 | 'MACHINE' refers to the machine name used in the build. | ||
64 | |||
65 | Under Linux, insert a USB flash drive. Assuming the USB flash drive | ||
66 | takes device /dev/sdf, use dd to copy the image to it. Before the image | ||
67 | can be burned onto a USB drive, it should be un-mounted. Some Linux distros | ||
68 | may automatically mount a USB drive when it is plugged in. Using USB device | ||
69 | /dev/sdf as an example, find all mounted partitions: | ||
70 | ``` | ||
71 | $ mount | grep sdf | ||
72 | ``` | ||
73 | |||
74 | and un-mount those that are mounted, for example: | ||
75 | ``` | ||
76 | $ umount /dev/sdf1 | ||
77 | $ umount /dev/sdf2 | ||
78 | ``` | ||
79 | |||
80 | Now burn the image onto the USB drive: | ||
81 | ``` | ||
82 | $ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress | ||
83 | $ sync | ||
84 | $ eject /dev/sdf | ||
85 | ``` | ||
86 | |||
87 | This should give you a bootable USB flash device. Insert the device | ||
88 | into a bootable USB socket on the target, and power on. This should | ||
89 | result in a system booted to the Sato graphical desktop. | ||
90 | |||
91 | If you want a terminal, use the arrows at the top of the UI to move to | ||
92 | different pages of available applications, one of which is named | ||
93 | 'Terminal'. Clicking that should give you a root terminal. | ||
94 | |||
95 | If you want to ssh into the system, you can use the root terminal to | ||
96 | ifconfig the IP address and use that to ssh in. The root password is | ||
97 | empty, so to log in type 'root' for the user name and hit 'Enter' at | ||
98 | the Password prompt: and you should be in. | ||
99 | |||
100 | If you find you're getting corrupt images on the USB (it doesn't show | ||
101 | the syslinux boot: prompt, or the boot: prompt contains strange | ||
102 | characters), try doing this first: | ||
103 | ``` | ||
104 | $ dd if=/dev/zero of=/dev/sdf bs=1M count=512 | ||
105 | ``` | ||
106 | |||
107 | ## Building the installer image | ||
108 | |||
109 | If you plan to install your image to your target machine, you can build a wic | ||
110 | based installer image instead of default wic image. To build it, you need to | ||
111 | add below configuration to local.conf : | ||
112 | |||
113 | ``` | ||
114 | WKS_FILE = "image-installer.wks.in" | ||
115 | IMAGE_FSTYPES:append = " ext4" | ||
116 | IMAGE_TYPEDEP:wic = "ext4" | ||
117 | INITRD_IMAGE_LIVE="core-image-minimal-initramfs" | ||
118 | do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete" | ||
119 | do_rootfs[depends] += "virtual/kernel:do_deploy" | ||
120 | IMAGE_BOOT_FILES:append = "\ | ||
121 | ${KERNEL_IMAGETYPE} \ | ||
122 | microcode.cpio \ | ||
123 | ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.rootfs.ext4;rootfs.img \ | ||
124 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
125 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \ | ||
126 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
127 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \ | ||
128 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} " | ||
129 | ``` | ||
130 | |||
131 | Burn the wic image onto USB flash device, insert the device to target machine | ||
132 | and power on. This should start the installation process. | ||
133 | |||
134 | |||
diff --git a/documentation/openvino.md b/documentation/openvino.md new file mode 100644 index 00000000..50dc680d --- /dev/null +++ b/documentation/openvino.md | |||
@@ -0,0 +1,95 @@ | |||
1 | Build a Yocto Image with OpenVINO™ toolkit | ||
2 | ========================================== | ||
3 | |||
4 | Follow the [Yocto Project official documentation](https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html#compatible-linux-distribution) to set up and configure your host machine to be compatible with BitBake. | ||
5 | |||
6 | ## Step 1: Set Up Environment | ||
7 | |||
8 | 1. Clone the repositories. | ||
9 | |||
10 | ``` | ||
11 | git clone https://git.yoctoproject.org/git/poky | ||
12 | git clone https://github.com/openembedded/meta-openembedded | ||
13 | git clone https://git.yoctoproject.org/git/meta-intel | ||
14 | ``` | ||
15 | |||
16 | |||
17 | 2. Set up the OpenEmbedded build environment. | ||
18 | |||
19 | ``` | ||
20 | source poky/oe-init-build-env | ||
21 | |||
22 | ``` | ||
23 | |||
24 | |||
25 | |||
26 | 3. Add BitBake layers. | ||
27 | |||
28 | |||
29 | ``` | ||
30 | bitbake-layers add-layer ../meta-openembedded/meta-oe | ||
31 | bitbake-layers add-layer ../meta-openembedded/meta-python | ||
32 | bitbake-layers add-layer ../meta-intel | ||
33 | |||
34 | ``` | ||
35 | |||
36 | |||
37 | 4. Set up BitBake configurations. | ||
38 | Include extra configuration in the `conf/local.conf` file in your build directory as required. | ||
39 | |||
40 | |||
41 | ``` | ||
42 | MACHINE = "intel-skylake-64" | ||
43 | |||
44 | # Enable building OpenVINO Python API. | ||
45 | # This requires meta-python layer to be included in bblayers.conf. | ||
46 | PACKAGECONFIG:append:pn-openvino-inference-engine = " python3" | ||
47 | |||
48 | # This adds OpenVINO related libraries in the target image. | ||
49 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine" | ||
50 | |||
51 | # This adds OpenVINO samples in the target image. | ||
52 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-samples" | ||
53 | |||
54 | # Include OpenVINO Python API package in the target image. | ||
55 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-python3" | ||
56 | |||
57 | # Include model conversion API in the target image. | ||
58 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-model-optimizer" | ||
59 | |||
60 | ``` | ||
61 | |||
62 | ## Step 2: Build a Yocto Image with OpenVINO Packages | ||
63 | |||
64 | Run BitBake to build your image with OpenVINO packages. For example, to build the minimal image, run the following command: | ||
65 | |||
66 | |||
67 | ``` | ||
68 | bitbake core-image-minimal | ||
69 | |||
70 | ``` | ||
71 | |||
72 | ## Step 3: Verify the Yocto Image | ||
73 | |||
74 | Verify that OpenVINO packages were built successfully. Run the following command: | ||
75 | |||
76 | ``` | ||
77 | oe-pkgdata-util list-pkgs | grep openvino | ||
78 | |||
79 | ``` | ||
80 | |||
81 | |||
82 | If the image build is successful, it will return the list of packages as below: | ||
83 | |||
84 | ``` | ||
85 | openvino-inference-engine | ||
86 | openvino-inference-engine-dbg | ||
87 | openvino-inference-engine-dev | ||
88 | openvino-inference-engine-python3 | ||
89 | openvino-inference-engine-samples | ||
90 | openvino-inference-engine-src | ||
91 | openvino-model-optimizer | ||
92 | openvino-model-optimizer-dbg | ||
93 | openvino-model-optimizer-dev | ||
94 | |||
95 | ``` | ||
diff --git a/documentation/reporting_bugs.md b/documentation/reporting_bugs.md new file mode 100644 index 00000000..5fbc3d27 --- /dev/null +++ b/documentation/reporting_bugs.md | |||
@@ -0,0 +1,22 @@ | |||
1 | ## Reporting bugs | ||
2 | |||
3 | If you have problems with or questions about a particular BSP, please | ||
4 | contact the maintainer listed in the [Maintainer](../README.md#maintainers) section directly (cc:ing | ||
5 | the Yocto mailing list puts it in the archive and helps other people | ||
6 | who might have the same questions in the future), but please try to do | ||
7 | the following first: | ||
8 | |||
9 | - look in the [Yocto Project Bugzilla](http://bugzilla.yoctoproject.org/) to see if a | ||
10 | problem has already been reported | ||
11 | |||
12 | - look through recent entries of the [meta-intel](https://lists.yoctoproject.org/g/meta-intel/messages) | ||
13 | and [Yocto Archives](https://lists.yoctoproject.org/g/yocto/messages) mailing list archives to see | ||
14 | if other people have run into similar problems or had similar questions answered. | ||
15 | |||
16 | If you believe you have encountered a bug, you can open a new bug and | ||
17 | enter the details in the [Yocto Project Bugzilla](https://bugzilla.yoctoproject.org/). | ||
18 | If you're relatively certain that it's a bug against the BSP itself, please use the | ||
19 | 'BSPs | bsps-meta-intel' category for the bug; otherwise, please submit the bug against | ||
20 | the most likely category for the problem. if you're wrong, it's not a big deal and | ||
21 | the bug will be recategorized upon triage. | ||
22 | |||
diff --git a/documentation/secureboot/README b/documentation/secureboot/README deleted file mode 100644 index 3d5703bb..00000000 --- a/documentation/secureboot/README +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Currently, only one implementation of Secure Boot is available out of the box, | ||
2 | which is using a single signed EFI application to directly boot the kernel with | ||
3 | an optional initramfs. | ||
4 | |||
5 | This can be added to your build either through local.conf, or via your own | ||
6 | custom image recipe. | ||
7 | |||
8 | If you are adding it via local.conf, set the following variables: | ||
9 | |||
10 | IMAGE_FEATURES += "secureboot" | ||
11 | WKS_FILE = "generic-bootdisk.wks.in" | ||
12 | SECURE_BOOT_SIGNING_KEY = "/path/to/your/signing/key" | ||
13 | SECURE_BOOT_SIGNING_CERT = "/path/to/your/signing/cert" | ||
14 | IMAGE_CLASSES += "uefi-comboapp" | ||
15 | |||
16 | If working with an image recipe, you can inherit uefi-comboapp directly instead | ||
17 | of using the IMAGE_CLASSES variable. | ||
18 | |||
19 | The signing keys and certs can be created via openssl commands. Here's an | ||
20 | example: | ||
21 | openssl req -new -x509 -newkey rsa:2048 -subj "/CN=your-subject/" -keyout \ | ||
22 | your-key.key -out your-key.crt -days 365 -nodes -sha256 | ||
23 | openssl x509 -in your-key.crt -out your-key.cer -outform DER | ||
24 | |||
25 | The .crt file is your SECURE_BOOT_SIGNING_CERT, and the .key file is your | ||
26 | SECURE_BOOT_SIGNING_KEY. | ||
27 | |||
28 | You should enroll the .crt key in your firmware under the PK, KEK, and DB | ||
29 | options (methods are different depending on your firmware). If a key should ever | ||
30 | become invalid, enroll it under DBX to blacklist it. | ||
31 | |||
32 | The comboapp can be further manipulated in a number of ways. You can modify the | ||
33 | kernel command line via the APPEND variable, you can change the default UUID via | ||
34 | the DISK_SIGNATURE_UUID variable, and you can modify the contents of the | ||
35 | initramfs via the INITRD_IMAGE or INITRD_LIVE variables. | ||
36 | |||
37 | A simple Secure Boot enabled image used for testing can be viewed at: | ||
38 | common/recipes-selftest/images/secureboot-selftest-image-signed.bb | ||
diff --git a/documentation/submitting_patches.md b/documentation/submitting_patches.md new file mode 100644 index 00000000..f36c4b08 --- /dev/null +++ b/documentation/submitting_patches.md | |||
@@ -0,0 +1,26 @@ | |||
1 | ## Guidelines for submitting patches | ||
2 | |||
3 | Please submit any patches against meta-intel BSPs to the | ||
4 | [meta-intel mailing list](https://lists.yoctoproject.org/g/meta-intel) | ||
5 | (email: meta-intel@lists.yoctoproject.org). Also, if your patches are | ||
6 | available via a public git repository, please also include a URL to | ||
7 | the repo and branch containing your patches as that makes it easier | ||
8 | for maintainers to grab and test your patches. | ||
9 | |||
10 | The patches should follow the suggestions outlined in the | ||
11 | [Yocto Project and OpenEmbedded Contributor Guide](https://docs.yoctoproject.org/dev/contributor-guide/index.html). | ||
12 | In addition, for any non-trivial patch, provide information about how you | ||
13 | tested the patch, and for any non-trivial or non-obvious testing | ||
14 | setup, provide details of that setup. | ||
15 | |||
16 | Doing a quick 'git log' in meta-intel will provide you with many | ||
17 | examples of good example commits if you have questions about any | ||
18 | aspect of the preferred format. | ||
19 | |||
20 | The meta-intel maintainers will do their best to review and/or pull in | ||
21 | a patch or patch sets within 24 hours of the time it was posted. For | ||
22 | larger and/or more involved patches and patch sets, the review process | ||
23 | may take longer. | ||
24 | |||
25 | Please see the [maintainers](../README.md#maintainers) section for the list of maintainers. It's also | ||
26 | a good idea to cc: the maintainer, if applicable. | ||
diff --git a/documentation/tested_hardware.md b/documentation/tested_hardware.md new file mode 100644 index 00000000..48a25ab4 --- /dev/null +++ b/documentation/tested_hardware.md | |||
@@ -0,0 +1,24 @@ | |||
1 | ## Tested Hardware | ||
2 | |||
3 | The following undergo regular basic testing with their respective MACHINE types. | ||
4 | |||
5 | - intel-corei7-64: | ||
6 | * Alder Lake-P | ||
7 | * Alder Lake-S | ||
8 | * Alder Lake-PS | ||
9 | * Elkhart Lake | ||
10 | * Metor Lake-P | ||
11 | * Raptor Lake-P | ||
12 | * Tiger Lake | ||
13 | |||
14 | - intel-skylake-64: | ||
15 | * Alder Lake-P | ||
16 | * Alder Lake-S | ||
17 | * Alder Lake-PS | ||
18 | * Elkhart Lake | ||
19 | * Metor Lake-P | ||
20 | * Raptor Lake-P | ||
21 | * Tiger Lake | ||
22 | |||
23 | - intel-core2-32: | ||
24 | * MinnowBoard Turbot | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb index afea70df..2fa3f627 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb | |||
@@ -15,7 +15,7 @@ inherit pkgconfig cmake ptest | |||
15 | DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 15 | DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | SRCREV = "ecd7fb6d5a0df6503d1691c1754a684b9c769c16" | 18 | SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78" |
19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \ | 19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \ |
20 | file://run-ptest \ | 20 | file://run-ptest \ |
21 | " | 21 | " |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb index 60125171..5214d5cf 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb | |||
@@ -8,13 +8,13 @@ LICENSE = "MIT & Apache-2.0" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ |
9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.05 \ | 11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \ |
12 | file://disable-werror.patch \ | 12 | file://disable-werror.patch \ |
13 | file://allow-to-find-cpp-generation-tool.patch \ | 13 | file://allow-to-find-cpp-generation-tool.patch \ |
14 | file://external-ocloc.patch \ | 14 | file://external-ocloc.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587" | 17 | SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb index 96d828b6..24eb97bd 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb | |||
@@ -6,9 +6,9 @@ hardware architecture." | |||
6 | LICENSE = "MIT & Apache-2.0" | 6 | LICENSE = "MIT & Apache-2.0" |
7 | LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ | 7 | LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ |
8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ | 8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ |
9 | file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" | 9 | file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.15985 \ | 11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \ |
12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ | 12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ |
13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \ | 13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \ |
14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \ | 14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \ |
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam | |||
19 | 19 | ||
20 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" | 20 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" |
21 | 21 | ||
22 | SRCREV_igc = "6cc111d262e1c3abcf4bc6b6d8a589ebf821a5c0" | 22 | SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775" |
23 | SRCREV_vc = "da892e1982b6c25b9a133f85b4ac97142d8a3def" | 23 | SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd" |
24 | SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" | 24 | SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" |
25 | SRCREV_spirv-headers = "cca08c63cefa129d082abca0302adcb81610b465" | 25 | SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3" |
26 | 26 | ||
27 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" | 27 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" |
28 | 28 | ||
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb index 70177c28..de765d6c 100644 --- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb +++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb | |||
@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \ | |||
5 | learning models for optimal execution on end-point target devices." | 5 | learning models for optimal execution on end-point target devices." |
6 | HOMEPAGE = "https://01.org/openvinotoolkit" | 6 | HOMEPAGE = "https://01.org/openvinotoolkit" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/0;lfs=0 \ | 8 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/1;lfs=0 \ |
9 | " | 9 | " |
10 | SRCREV = "34caeefd07800b59065345d651949efbe8ab6649" | 10 | SRCREV = "f4afc983258bcb2592d999ed6700043fdb58ad78" |
11 | 11 | ||
12 | LICENSE = "Apache-2.0" | 12 | LICENSE = "Apache-2.0" |
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb index 63b69ce8..bdf32576 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb | |||
@@ -10,11 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | |||
10 | 10 | ||
11 | COMPATIBLE_HOST:libc-musl = "null" | 11 | COMPATIBLE_HOST:libc-musl = "null" |
12 | 12 | ||
13 | inherit cmake systemd features_check | 13 | inherit cmake systemd features_check python3native |
14 | 14 | ||
15 | DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native" | 15 | DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native" |
16 | |||
17 | EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" | ||
18 | 16 | ||
19 | # Enable either connman or networkmanager or none but not both. | 17 | # Enable either connman or networkmanager or none but not both. |
20 | PACKAGECONFIG ??= "connman" | 18 | PACKAGECONFIG ??= "connman" |
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch index 270cc84d..ea86bc31 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001 | 1 | From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001 |
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | 2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> |
3 | Date: Mon, 11 Mar 2024 13:13:32 +0800 | 3 | Date: Mon, 11 Mar 2024 13:13:32 +0800 |
4 | Subject: [PATCH] Makefile: Fix build Issue | 4 | Subject: [PATCH] Makefile: Fix build Issue |
@@ -6,14 +6,13 @@ MIME-Version: 1.0 | |||
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
8 | 8 | ||
9 | In case build directory is different from source, make sure make is able to find the correct input files. | 9 | In case build directory is different from source, make sure make is able to find the correct input files. |
10 | 10 | ||
11 | Fixes: | 11 | Fixes: |
12 | | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml | 12 | | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml |
13 | | glib-compile-resources --generate-source thermald-resource.gresource.xml | 13 | | glib-compile-resources --generate-source thermald-resource.gresource.xml |
14 | | Failed to open file “thermald-resource.gresource.xml”: No such file or directory | 14 | | Failed to open file “thermald-resource.gresource.xml”: No such file or directory |
15 | 15 | ||
16 | |||
17 | Upstream-Status: Submitted | 16 | Upstream-Status: Submitted |
18 | https://github.com/intel/thermal_daemon/pull/436 | 17 | https://github.com/intel/thermal_daemon/pull/436 |
19 | 18 | ||
@@ -23,10 +22,10 @@ Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | |||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 23 | ||
25 | diff --git a/Makefile.am b/Makefile.am | 24 | diff --git a/Makefile.am b/Makefile.am |
26 | index a0c051a..772e280 100644 | 25 | index dd2ef10..cb19e17 100644 |
27 | --- a/Makefile.am | 26 | --- a/Makefile.am |
28 | +++ b/Makefile.am | 27 | +++ b/Makefile.am |
29 | @@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml | 28 | @@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml |
30 | $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< | 29 | $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< |
31 | 30 | ||
32 | thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml | 31 | thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml |
@@ -34,6 +33,3 @@ index a0c051a..772e280 100644 | |||
34 | + $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< | 33 | + $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< |
35 | 34 | ||
36 | CLEANFILES = $(BUILT_SOURCES) | 35 | CLEANFILES = $(BUILT_SOURCES) |
37 | -- | ||
38 | 2.34.1 | ||
39 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb index df242cdf..66765e56 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ | |||
16 | file://0001-Makefile-Fix-build-Issue.patch \ | 16 | file://0001-Makefile-Fix-build-Issue.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4" | 19 | SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit pkgconfig autotools systemd gtk-doc | 22 | inherit pkgconfig autotools systemd gtk-doc |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch deleted file mode 100644 index d1851406..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com> | ||
3 | Date: Tue, 20 Feb 2024 02:28:14 +0200 | ||
4 | Subject: [PATCH] [CPU] Solving the build failure caused by setting the | ||
5 | "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934) | ||
6 | |||
7 | ### Details: | ||
8 | See the [ticket | ||
9 | description](https://jira.devtools.intel.com/browse/CVS-132119). The | ||
10 | solution was checked only on a local setup on Ubuntu, if there's a way | ||
11 | to check that using the CI please let me know (or if you could run the | ||
12 | job and paste the link in the comments I would be grateful). | ||
13 | |||
14 | Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if | ||
15 | this is the ideal fix and no side effects are introduced. Please take | ||
16 | that into account when reviewing/merging. | ||
17 | |||
18 | ### Tickets: | ||
19 | - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119) | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8] | ||
22 | |||
23 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
24 | --- | ||
25 | src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
29 | index db5ae8d01c..6941cb528d 100644 | ||
30 | --- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
31 | +++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
32 | @@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp | ||
33 | if(ENABLE_OV_ONNX_FRONTEND) | ||
34 | list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}") | ||
35 | else() | ||
36 | - set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) | ||
37 | + set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) | ||
38 | endif() | ||
39 | |||
40 | if(NOT (ARM OR AARCH64)) | ||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch deleted file mode 100644 index d251f21b..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Fri, 15 Mar 2024 16:28:41 +0800 | ||
4 | Subject: [PATCH] cmake: fix build when using sysroot | ||
5 | |||
6 | When cross-compiling against a sysroot, system headers will not be at a place | ||
7 | that starts with /usr. Update conditional check to exclude directories | ||
8 | which have "/usr/include" in them to not add <sysroot>/usr/include as well. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486] | ||
11 | |||
12 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
13 | --- | ||
14 | src/cmake/ov_parallel.cmake | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake | ||
18 | index 3793db98e30..819d3410531 100644 | ||
19 | --- a/src/cmake/ov_parallel.cmake | ||
20 | +++ b/src/cmake/ov_parallel.cmake | ||
21 | @@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME) | ||
22 | if(include_directories) | ||
23 | foreach(include_directory IN LISTS include_directories) | ||
24 | # cannot include /usr/include headers as SYSTEM | ||
25 | - if(NOT "${include_directory}" MATCHES "^/usr.*$") | ||
26 | + if(NOT "${include_directory}" MATCHES ".*/usr/include.*$") | ||
27 | target_include_directories(${TARGET_NAME} SYSTEM | ||
28 | ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>) | ||
29 | else() | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch index 7ab31309..7f5b46c6 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |||
@@ -1,11 +1,11 @@ | |||
1 | From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001 | 1 | From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 | 3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 |
4 | Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process | 4 | Subject: [PATCH] cmake: yocto specific tweaks to the build process |
5 | 5 | ||
6 | * Dont try to detect glibc version as that doesn't work when cross compiling. | 6 | * Dont try to detect glibc version as that doesn't work when cross compiling. |
7 | * Dont try to detect CXX11_ABI | ||
7 | * Install sample binaries as well. | 8 | * Install sample binaries as well. |
8 | * Dont strip binaries. | ||
9 | * Dont try to write triggers for CPack. We package ourselves. | 9 | * Dont try to write triggers for CPack. We package ourselves. |
10 | * Fix the installation path for Python modules when baselib = lib64. | 10 | * Fix the installation path for Python modules when baselib = lib64. |
11 | 11 | ||
@@ -14,17 +14,16 @@ Upstream-Status: Inappropriate | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
15 | --- | 15 | --- |
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | 16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- |
17 | cmake/developer_package/target_flags.cmake | 2 +- | 17 | cmake/developer_package/target_flags.cmake | 4 ++-- |
18 | samples/cpp/CMakeLists.txt | 6 +++--- | 18 | samples/cpp/CMakeLists.txt | 6 +++--- |
19 | src/bindings/python/CMakeLists.txt | 2 +- | 19 | src/bindings/python/CMakeLists.txt | 2 +- |
20 | src/bindings/python/wheel/setup.py | 1 - | 20 | 4 files changed, 7 insertions(+), 7 deletions(-) |
21 | 5 files changed, 6 insertions(+), 7 deletions(-) | ||
22 | 21 | ||
23 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | 22 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake |
24 | index a7c0ec2cf61..40448e8a962 100644 | 23 | index 99f11730983..1a1f61fcd3d 100644 |
25 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake | 24 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake |
26 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake | 25 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake |
27 | @@ -154,7 +154,7 @@ ov_rpm_specific_settings() | 26 | @@ -156,7 +156,7 @@ ov_rpm_specific_settings() |
28 | # needed to add triggers for packages with libraries | 27 | # needed to add triggers for packages with libraries |
29 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") | 28 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") |
30 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") | 29 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") |
@@ -34,17 +33,26 @@ index a7c0ec2cf61..40448e8a962 100644 | |||
34 | # | 33 | # |
35 | # Functions helpful for packaging your modules with RPM cpack | 34 | # Functions helpful for packaging your modules with RPM cpack |
36 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | 35 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake |
37 | index 29f23e713e1..942dd445b19 100644 | 36 | index d047a1aebd9..4e8ca68c60f 100644 |
38 | --- a/cmake/developer_package/target_flags.cmake | 37 | --- a/cmake/developer_package/target_flags.cmake |
39 | +++ b/cmake/developer_package/target_flags.cmake | 38 | +++ b/cmake/developer_package/target_flags.cmake |
40 | @@ -145,4 +145,4 @@ function(ov_glibc_version) | 39 | @@ -149,7 +149,7 @@ function(ov_glibc_version) |
41 | endif() | 40 | endif() |
42 | endfunction() | 41 | endfunction() |
43 | 42 | ||
44 | -ov_glibc_version() | 43 | -ov_glibc_version() |
45 | +#ov_glibc_version() | 44 | +#ov_glibc_version() |
45 | |||
46 | # | ||
47 | # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler | ||
48 | @@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi) | ||
49 | endif() | ||
50 | endmacro() | ||
51 | |||
52 | -ov_get_glibcxx_use_cxx11_abi() | ||
53 | +#ov_get_glibcxx_use_cxx11_abi() | ||
46 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | 54 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt |
47 | index c814cc37e2c..431e7bd2ed3 100644 | 55 | index 4d33bff944e..3e7f1458578 100644 |
48 | --- a/samples/cpp/CMakeLists.txt | 56 | --- a/samples/cpp/CMakeLists.txt |
49 | +++ b/samples/cpp/CMakeLists.txt | 57 | +++ b/samples/cpp/CMakeLists.txt |
50 | @@ -206,9 +206,9 @@ macro(ov_add_sample) | 58 | @@ -206,9 +206,9 @@ macro(ov_add_sample) |
@@ -61,30 +69,18 @@ index c814cc37e2c..431e7bd2ed3 100644 | |||
61 | # create global target with all samples / demo apps | 69 | # create global target with all samples / demo apps |
62 | if(NOT TARGET ov_samples) | 70 | if(NOT TARGET ov_samples) |
63 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | 71 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt |
64 | index 58ff9b74302..4763994ba56 100644 | 72 | index 6cf43ec3fed..d539b9d003f 100644 |
65 | --- a/src/bindings/python/CMakeLists.txt | 73 | --- a/src/bindings/python/CMakeLists.txt |
66 | +++ b/src/bindings/python/CMakeLists.txt | 74 | +++ b/src/bindings/python/CMakeLists.txt |
67 | @@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING) | 75 | @@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING) |
68 | endif() | 76 | # install OpenVINO Python API |
69 | 77 | ||
70 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | 78 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") |
71 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | 79 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") |
72 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | 80 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") |
73 | set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | 81 | set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") |
74 | set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO") | 82 | set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO") |
75 | |||
76 | diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py | ||
77 | index 4b056912212..5f05d891310 100644 | ||
78 | --- a/src/bindings/python/wheel/setup.py | ||
79 | +++ b/src/bindings/python/wheel/setup.py | ||
80 | @@ -270,7 +270,6 @@ class CustomBuild(build): | ||
81 | self.spawn(["cmake", "--install", binary_dir, | ||
82 | "--prefix", prefix, | ||
83 | "--config", CONFIG, | ||
84 | - "--strip", | ||
85 | "--component", cpack_comp_name]) | ||
86 | 83 | ||
87 | def run(self): | ||
88 | -- | 84 | -- |
89 | 2.34.1 | 85 | 2.34.1 |
90 | 86 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch index e0967d55..8a1464d5 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001 | 1 | From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 29 Nov 2023 12:49:35 +0530 | 3 | Date: Wed, 29 Nov 2023 12:49:35 +0530 |
4 | Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error | 4 | Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error |
5 | 5 | ||
6 | * Remove -Werror for: | 6 | * Remove -Werror for: |
7 | |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] | 7 | |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] |
@@ -16,10 +16,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt | 18 | diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt |
19 | index b0c66a435d6..a3037147cc2 100644 | 19 | index 2f3d9127dde..2fd4f5c1b3c 100644 |
20 | --- a/src/plugins/intel_gpu/CMakeLists.txt | 20 | --- a/src/plugins/intel_gpu/CMakeLists.txt |
21 | +++ b/src/plugins/intel_gpu/CMakeLists.txt | 21 | +++ b/src/plugins/intel_gpu/CMakeLists.txt |
22 | @@ -38,7 +38,7 @@ add_subdirectory(thirdparty) | 22 | @@ -47,7 +47,7 @@ add_subdirectory(thirdparty) |
23 | include(thirdparty/cmake/rapidjson.cmake) | 23 | include(thirdparty/cmake/rapidjson.cmake) |
24 | 24 | ||
25 | if(CMAKE_COMPILER_IS_GNUCXX) | 25 | if(CMAKE_COMPILER_IS_GNUCXX) |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch index 59095133..bbdeaa2a 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001 | 1 | From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 | 3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 |
4 | Subject: [PATCH 4/4] protobuf: allow target protoc to be built | 4 | Subject: [PATCH 3/3] protobuf: allow target protoc to be built |
5 | 5 | ||
6 | We can run target binaries using a qemu wrapper so allow these to be | 6 | We can run target binaries using a qemu wrapper so allow these to be |
7 | built and run. | 7 | built and run. |
@@ -15,10 +15,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | 15 | 2 files changed, 2 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | 17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake |
18 | index 49c5b881030..2a1ea8562bc 100644 | 18 | index f3b5520d6d2..7579f638c5a 100644 |
19 | --- a/cmake/developer_package/frontends/frontends.cmake | 19 | --- a/cmake/developer_package/frontends/frontends.cmake |
20 | +++ b/cmake/developer_package/frontends/frontends.cmake | 20 | +++ b/cmake/developer_package/frontends/frontends.cmake |
21 | @@ -143,7 +143,7 @@ macro(ov_add_frontend) | 21 | @@ -163,7 +163,7 @@ macro(ov_add_frontend) |
22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) | 22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) |
23 | add_custom_command( | 23 | add_custom_command( |
24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" | 24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" |
@@ -28,10 +28,10 @@ index 49c5b881030..2a1ea8562bc 100644 | |||
28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" | 28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" |
29 | VERBATIM | 29 | VERBATIM |
30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt | 30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt |
31 | index 4b6d6da87f3..409e492a5b3 100644 | 31 | index 15f32601f23..36853caf7dc 100644 |
32 | --- a/thirdparty/protobuf/CMakeLists.txt | 32 | --- a/thirdparty/protobuf/CMakeLists.txt |
33 | +++ b/thirdparty/protobuf/CMakeLists.txt | 33 | +++ b/thirdparty/protobuf/CMakeLists.txt |
34 | @@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen | 34 | @@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE) |
35 | if(CMAKE_CROSSCOMPILING OR | 35 | if(CMAKE_CROSSCOMPILING OR |
36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR | 36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR |
37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) | 37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb index 495a4786..a9422e70 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=mast | |||
8 | file://0001-use-oe-gflags.patch \ | 8 | file://0001-use-oe-gflags.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80" | 11 | SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf" |
12 | 12 | ||
13 | LICENSE = "Apache-2.0" | 13 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |
@@ -44,11 +44,11 @@ do_install(){ | |||
44 | install -d ${D}${bindir} | 44 | install -d ${D}${bindir} |
45 | install -d ${D}${datadir}/openvino/open-model-zoo/tools | 45 | install -d ${D}${datadir}/openvino/open-model-zoo/tools |
46 | install -d ${D}${datadir}/openvino/open-model-zoo/demos | 46 | install -d ${D}${datadir}/openvino/open-model-zoo/demos |
47 | cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir} | 47 | cp -rf ${B}/intel64/Release/*.a ${D}${libdir} |
48 | cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} | 48 | cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir} |
49 | cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo | 49 | cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo |
50 | cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo | 50 | cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo |
51 | cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools | 51 | cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools |
52 | } | 52 | } |
53 | 53 | ||
54 | FILES:${PN} += "${datadir}/openvino" | 54 | FILES:${PN} += "${datadir}/openvino" |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb index 94edd1b8..675d9920 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb | |||
@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | |||
4 | deep learning models through a high-level C++ Inference Engine API \ | 4 | deep learning models through a high-level C++ Inference Engine API \ |
5 | integrated with application logic." | 5 | integrated with application logic." |
6 | 6 | ||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/0;lfs=0 \ | 7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \ |
8 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ | 8 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ |
9 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ | 9 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ |
10 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ | 10 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ |
@@ -16,16 +16,15 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=ope | |||
16 | git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ | 16 | git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ |
17 | git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ | 17 | git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ |
18 | git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ | 18 | git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ |
19 | git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \ | ||
19 | file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ | 20 | file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ |
20 | file://0003-cmake-Fix-overloaded-virtual-error.patch \ | 21 | file://0002-cmake-Fix-overloaded-virtual-error.patch \ |
21 | file://0004-protobuf-allow-target-protoc-to-be-built.patch \ | 22 | file://0003-protobuf-allow-target-protoc-to-be-built.patch \ |
22 | file://0001-cmake-fix-build-when-using-sysroot.patch \ | ||
23 | file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \ | ||
24 | " | 23 | " |
25 | 24 | ||
26 | SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649" | 25 | SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78" |
27 | SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060" | 26 | SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3" |
28 | SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f" | 27 | SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c" |
29 | SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" | 28 | SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" |
30 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" | 29 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" |
31 | SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" | 30 | SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" |
@@ -35,7 +34,8 @@ SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851" | |||
35 | SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" | 34 | SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" |
36 | SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" | 35 | SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" |
37 | SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" | 36 | SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" |
38 | SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas" | 37 | SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b" |
38 | SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry" | ||
39 | 39 | ||
40 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" | 40 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" |
41 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 41 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |
@@ -50,6 +50,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | |||
50 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ | 50 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ |
51 | file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ | 51 | file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ |
52 | file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \ | 52 | file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \ |
53 | file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
53 | " | 54 | " |
54 | 55 | ||
55 | inherit cmake python3native pkgconfig qemu | 56 | inherit cmake python3native pkgconfig qemu |
@@ -74,6 +75,7 @@ EXTRA_OECMAKE += " \ | |||
74 | -DENABLE_SYSTEM_FLATBUFFERS=ON \ | 75 | -DENABLE_SYSTEM_FLATBUFFERS=ON \ |
75 | -DENABLE_SYSTEM_SNAPPY=ON \ | 76 | -DENABLE_SYSTEM_SNAPPY=ON \ |
76 | -DFETCHCONTENT_BASE_DIR="${S}" \ | 77 | -DFETCHCONTENT_BASE_DIR="${S}" \ |
78 | -DENABLE_INTEL_NPU=OFF \ | ||
77 | " | 79 | " |
78 | 80 | ||
79 | DEPENDS += "\ | 81 | DEPENDS += "\ |
@@ -133,6 +135,7 @@ FILES:${PN}-samples = "${datadir}/openvino \ | |||
133 | ${libdir}/libformat_reader.a \ | 135 | ${libdir}/libformat_reader.a \ |
134 | ${libdir}/libopencv_c_wrapper.a \ | 136 | ${libdir}/libopencv_c_wrapper.a \ |
135 | " | 137 | " |
138 | |||
136 | RDEPENDS:${PN}-samples += "python3-core" | 139 | RDEPENDS:${PN}-samples += "python3-core" |
137 | 140 | ||
138 | # Package for inference engine python API | 141 | # Package for inference engine python API |
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb index 31e9344b..df459d72 100644 --- a/recipes-core/libxcam/libxcam_1.5.0.bb +++ b/recipes-core/libxcam/libxcam_1.5.0.bb | |||
@@ -30,7 +30,7 @@ PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," | |||
30 | 30 | ||
31 | do_install:append () { | 31 | do_install:append () { |
32 | install -d ${D}${bindir}/libxcam | 32 | install -d ${D}${bindir}/libxcam |
33 | cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ | 33 | cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/ |
34 | } | 34 | } |
35 | 35 | ||
36 | FILES:${PN} += "${libdir}/gstreamer-*/*.so" | 36 | FILES:${PN} += "${libdir}/gstreamer-*/*.so" |
diff --git a/recipes-core/microcode/intel-microcode_20231114.bb b/recipes-core/microcode/intel-microcode_20240312.bb index 9eea6d63..00b18231 100644 --- a/recipes-core/microcode/intel-microcode_20231114.bb +++ b/recipes-core/microcode/intel-microcode_20240312.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721" | |||
16 | SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \ | 16 | SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV = "ece0d294a29a1375397941a4e6f2f7217910bc89" | 19 | SRCREV = "41af34500598418150aa298bb04e7edacc547897" |
20 | 20 | ||
21 | DEPENDS = "iucode-tool-native" | 21 | DEPENDS = "iucode-tool-native" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch new file mode 100644 index 00000000..195b3c58 --- /dev/null +++ b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 683f3552e7d5089601bb37952641b1c7691cf475 Mon Sep 17 00:00:00 2001 | ||
2 | From: John Machado <john.machado@intel.com> | ||
3 | Date: Mon, 25 Mar 2024 11:13:27 +0530 | ||
4 | Subject: [PATCH] Add new DG2 device IDs (#194) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/dcc4b85ea3728c848b62fbb164c00f43b519b6fb] | ||
7 | |||
8 | Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
9 | --- | ||
10 | Source/inc/common/igfxfmid.h | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h | ||
14 | index 1264087..e944e1e 100644 | ||
15 | --- a/Source/inc/common/igfxfmid.h | ||
16 | +++ b/Source/inc/common/igfxfmid.h | ||
17 | @@ -1934,6 +1934,8 @@ typedef enum __NATIVEGTTYPE | ||
18 | #define DEV_ID_56BB 0x56BB | ||
19 | #define DEV_ID_56BC 0x56BC | ||
20 | #define DEV_ID_56BD 0x56BD | ||
21 | +#define DEV_ID_56BE 0x56BE | ||
22 | +#define DEV_ID_56BF 0x56BF | ||
23 | #define DEV_ID_56C0 0x56C0 | ||
24 | #define DEV_ID_56C1 0x56C1 | ||
25 | #define DEV_ID_56C2 0x56C2 | ||
26 | @@ -2001,6 +2003,8 @@ typedef enum __NATIVEGTTYPE | ||
27 | ( d == DEV_ID_5690 ) || \ | ||
28 | ( d == DEV_ID_5691 ) || \ | ||
29 | ( d == DEV_ID_5692 ) || \ | ||
30 | + ( d == DEV_ID_56BE ) || \ | ||
31 | + ( d == DEV_ID_56BF ) || \ | ||
32 | ( d == DEV_ID_56C0 ) || \ | ||
33 | ( d == DEV_ID_56C2 ) || \ | ||
34 | ( d == DEV_ID_4F80 ) || \ | ||
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch deleted file mode 100644 index ab4cb178..00000000 --- a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001 | ||
2 | From: John Machado <john.machado@intel.com> | ||
3 | Date: Fri, 9 Feb 2024 13:10:18 +0530 | ||
4 | Subject: [PATCH] Introduce ARL-H support (#172) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179] | ||
7 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
8 | --- | ||
9 | Source/inc/common/igfxfmid.h | 10 ++++++++++ | ||
10 | 1 file changed, 10 insertions(+) | ||
11 | |||
12 | diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h | ||
13 | index 99fc624..19aa505 100644 | ||
14 | --- a/Source/inc/common/igfxfmid.h | ||
15 | +++ b/Source/inc/common/igfxfmid.h | ||
16 | @@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE | ||
17 | // ARL-S | ||
18 | #define DEV_ID_7D67 0x7D67 | ||
19 | |||
20 | +// ARL-H | ||
21 | +#define DEV_ID_7D41 0x7D41 | ||
22 | +#define DEV_ID_7D51 0x7D51 | ||
23 | +#define DEV_ID_7DD1 0x7DD1 | ||
24 | + | ||
25 | #define MGM_HAS 0 | ||
26 | |||
27 | //#define SDG_HAS 1 //Reserve place for Springdale-G HAS | ||
28 | @@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE | ||
29 | // Macro to identify ARL-S Device ID | ||
30 | #define GFX_IS_ARL_S(d) ( ( d == DEV_ID_7D67 ) ) | ||
31 | |||
32 | +// Macro to identify ARL-H Device ID | ||
33 | +#define GFX_IS_ARL_H(d) ( ( d == DEV_ID_7D41 ) || \ | ||
34 | + ( d == DEV_ID_7D51 ) || \ | ||
35 | + ( d == DEV_ID_7DD1 )) | ||
36 | + | ||
37 | //we define the highest cap and lower cap of stepping IDs | ||
38 | #define SI_REV_ID(lo,hi) (lo | hi<<16) | ||
39 | |||
40 | -- | ||
41 | 2.40.1 | ||
42 | |||
diff --git a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb index 5928fb86..134a6461 100644 --- a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb +++ b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb | |||
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654" | |||
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
10 | git://github.com/intel/gmmlib.git;protocol=https;branch=master \ | 10 | git://github.com/intel/gmmlib.git;protocol=https;branch=master \ |
11 | file://0001-Introduce-ARL-H-support-172.patch \ | 11 | file://0001-Add-new-DG2-device-IDs-194.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc" | 14 | SRCREV = "ac964bdffdda7730e8234511f61016071e63783b" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb index 9c26f009..0407aa18 100644 --- a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb +++ b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb | |||
@@ -14,8 +14,8 @@ SECTION = "x11" | |||
14 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https" | 17 | SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.21-branch;protocol=https" |
18 | SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8" | 18 | SRCREV = "5a59217d5d288f7671ca18d3764139289d83a93e" |
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
21 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 21 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
diff --git a/recipes-graphics/libva/libva-intel_2.20.0.bb b/recipes-graphics/libva/libva-intel_2.21.0.bb index c81ed65c..83fb3646 100644 --- a/recipes-graphics/libva/libva-intel_2.20.0.bb +++ b/recipes-graphics/libva/libva-intel_2.21.0.bb | |||
@@ -17,11 +17,12 @@ SECTION = "x11" | |||
17 | LICENSE = "MIT" | 17 | LICENSE = "MIT" |
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" |
19 | 19 | ||
20 | SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \ | 20 | SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.21-branch \ |
21 | " | 21 | " |
22 | SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49" | ||
23 | 22 | ||
24 | S = "${WORKDIR}/libva-${PV}" | 23 | SRCREV = "0b01aed44ef1a6ad660261284ff266fa812829ef" |
24 | |||
25 | S = "${WORKDIR}/git" | ||
25 | 26 | ||
26 | UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" | 27 | UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" |
27 | 28 | ||
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb index 3ed1c9bd..d3f32c25 100644 --- a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb +++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb | |||
@@ -8,7 +8,7 @@ SECTION = "lib" | |||
8 | inherit pkgconfig cmake | 8 | inherit pkgconfig cmake |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc" | 11 | SRCREV = "24c4dfd45df1600ca83dfb03217675edc4633ffd" |
12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ |
13 | " | 13 | " |
14 | 14 | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_6.6.bb b/recipes-kernel/linux/linux-intel-rt_6.6.bb index d67f4a40..342679eb 100644 --- a/recipes-kernel/linux/linux-intel-rt_6.6.bb +++ b/recipes-kernel/linux/linux-intel-rt_6.6.bb | |||
@@ -21,9 +21,9 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" | |||
21 | 21 | ||
22 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | 22 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" |
23 | 23 | ||
24 | LINUX_VERSION ?= "6.6.20" | 24 | LINUX_VERSION ?= "6.6.25" |
25 | SRCREV_machine ?= "7b98bc01fb4e0fc1649650472fc5978963235923" | 25 | SRCREV_machine ?= "f8939454cf9bb7277239bb44e90c99474c599f37" |
26 | SRCREV_meta ?= "5b185a8716c8c62dc1c7751e6d12f8b67f58274f" | 26 | SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a" |
27 | 27 | ||
28 | LINUX_KERNEL_TYPE = "preempt-rt" | 28 | LINUX_KERNEL_TYPE = "preempt-rt" |
29 | 29 | ||
diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb index c90f9286..3b917bfa 100644 --- a/recipes-kernel/linux/linux-intel_6.6.bb +++ b/recipes-kernel/linux/linux-intel_6.6.bb | |||
@@ -11,9 +11,9 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" | |||
11 | 11 | ||
12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | 12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" |
13 | 13 | ||
14 | LINUX_VERSION ?= "6.6.20" | 14 | LINUX_VERSION ?= "6.6.25" |
15 | SRCREV_machine ?= "lts-v6.6.20-linux-240308T063847Z" | 15 | SRCREV_machine ?= "lts-v6.6.25-linux-240415T215440Z" |
16 | SRCREV_meta ?= "5b185a8716c8c62dc1c7751e6d12f8b67f58274f" | 16 | SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a" |
17 | 17 | ||
18 | # Functionality flags | 18 | # Functionality flags |
19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | 19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" |
diff --git a/recipes-multimedia/itt/itt_3.24.6.bb b/recipes-multimedia/itt/itt_3.24.7.bb index 1c4759f9..481fd5be 100644 --- a/recipes-multimedia/itt/itt_3.24.6.bb +++ b/recipes-multimedia/itt/itt_3.24.7.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c7 | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master" |
12 | SRCREV = "ec077431fc725dba590b09b2cec5137878b14783" | 12 | SRCREV = "e20cd6099cb9c5afee0a285781c5cc1d32412f3e" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | PE = "1" | 14 | PE = "1" |
15 | 15 | ||
diff --git a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch deleted file mode 100644 index 59fff127..00000000 --- a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From bb860c0bfe53060925b1dce50da4e6e94cfc8cae Mon Sep 17 00:00:00 2001 | ||
2 | From: huangli2018 <li.h.huang@intel.com> | ||
3 | Date: Wed, 20 Dec 2023 15:47:43 +0800 | ||
4 | Subject: [PATCH 04/13] Add device ID for ARL | ||
5 | |||
6 | Add device ID for ARL | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/95cbfce81cafa3c24d9d4601d41a855093bc51fb] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | 13 +++++++++++-- | ||
12 | 1 file changed, 11 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
15 | index 426bd795f..7b73dfaff 100644 | ||
16 | --- a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
17 | +++ b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
18 | @@ -1,6 +1,6 @@ | ||
19 | /*===================== begin_copyright_notice ================================== | ||
20 | |||
21 | -Copyright (c) 2022, Intel Corporation | ||
22 | +Copyright (c) 2023, Intel Corporation | ||
23 | |||
24 | Permission is hereby granted, free of charge, to any person obtaining a | ||
25 | copy of this software and associated documentation files (the "Software"), | ||
26 | @@ -218,4 +218,13 @@ static struct GfxDeviceInfo arlInfo = { | ||
27 | }; | ||
28 | |||
29 | static bool arlsDevice7d67 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
30 | - RegisterDevice(0x7D67, &arlInfo); | ||
31 | \ No newline at end of file | ||
32 | + RegisterDevice(0x7D67, &arlInfo); | ||
33 | + | ||
34 | +static bool arlhDevice7d51 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
35 | + RegisterDevice(0x7D51, &arlInfo); | ||
36 | + | ||
37 | +static bool arlhDevice7dd1 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
38 | + RegisterDevice(0x7DD1, &arlInfo); | ||
39 | + | ||
40 | +static bool arlhDevice7d41 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
41 | + RegisterDevice(0x7D41, &arlInfo); | ||
42 | \ No newline at end of file | ||
43 | -- | ||
44 | 2.40.1 | ||
45 | |||
diff --git a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch deleted file mode 100644 index a9cd2317..00000000 --- a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From bbd3af94a6146d702909ff7e25b0c0547ecbb895 Mon Sep 17 00:00:00 2001 | ||
2 | From: jlui <jonathan.ming.jun.lui@intel.com> | ||
3 | Date: Wed, 15 Nov 2023 10:48:34 +0800 | ||
4 | Subject: [PATCH 05/13] Add XR24 support to DMABuf | ||
5 | |||
6 | This is to enable XR24/BGRX support for DMABuf | ||
7 | |||
8 | Signed-off-by: Lui, Jonathan Ming Jun <jonathan.ming.jun.lui@intel.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/3910b7029f5416fd0b5972f940c65d0a82c48c7b] | ||
11 | |||
12 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
13 | --- | ||
14 | .../vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
18 | index fdcca8873..2dcf440a4 100644 | ||
19 | --- a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
20 | +++ b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
21 | @@ -55,8 +55,9 @@ static ProfileSurfaceAttribInfo surfaceAttribInfo_VAEntrypointVideoProc_VAProfil | ||
22 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('4', '2', '2', 'V')}}}, | ||
23 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'A')}}}, | ||
24 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('B', 'G', 'R', 'A')}}}, | ||
25 | - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, { VA_FOURCC('R', 'G', 'B', 'P')}}}, | ||
26 | + {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'P')}}}, | ||
27 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'X')}}}, | ||
28 | + {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('X', 'R', 'G', 'B')}}}, | ||
29 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('P', '0', '1', '0')}}}, | ||
30 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', '2', '4')}}}, | ||
31 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}}, | ||
32 | -- | ||
33 | 2.40.1 | ||
34 | |||
diff --git a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch deleted file mode 100644 index 5b04201a..00000000 --- a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch +++ /dev/null | |||
@@ -1,214 +0,0 @@ | |||
1 | From 67fb6128adf8fc03d429393e98f0982b42a40e64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhang_Xinfeng <carl.zhang@intel.com> | ||
3 | Date: Wed, 27 Dec 2023 09:59:29 +0800 | ||
4 | Subject: [PATCH 06/12] add INTEL MEDIA ALLOC refineE to specify the memory | ||
5 | alignment | ||
6 | |||
7 | this key is used to allocate bigger pages | ||
8 | env variable INTEL_MEDIA_ALLOC_refineE also could be used | ||
9 | and was not enabled by default | ||
10 | mode 0 is default mode | ||
11 | mode 1 is < 64 align to 64 | ||
12 | mode 2 is > 1M && <= 3M align to 1M, >3M align to 2M | ||
13 | mode 3 is mode 1 & mode 2 | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/765dd939dcc5562d18cca18e5eda505bda952797] | ||
16 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
17 | --- | ||
18 | .../linux/common/os/i915/mos_bufmgr.c | 75 +++++++++++++++---- | ||
19 | .../common/os/i915_production/mos_bufmgr.c | 1 + | ||
20 | .../common/os/mos_context_specific_next.cpp | 21 +++++- | ||
21 | .../common/os/mos_user_setting_specific.cpp | 7 ++ | ||
22 | 4 files changed, 90 insertions(+), 14 deletions(-) | ||
23 | |||
24 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
25 | index c0b3ba027..b623d0129 100644 | ||
26 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
27 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
28 | @@ -138,7 +138,7 @@ struct mos_bufmgr_gem { | ||
29 | int exec_count; | ||
30 | |||
31 | /** Array of lists of cached gem objects of power-of-two sizes */ | ||
32 | - struct mos_gem_bo_bucket cache_bucket[14 * 4]; | ||
33 | + struct mos_gem_bo_bucket cache_bucket[64]; | ||
34 | int num_buckets; | ||
35 | time_t time; | ||
36 | |||
37 | @@ -3852,9 +3852,9 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size) | ||
38 | } | ||
39 | |||
40 | static void | ||
41 | -init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
42 | +init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode) | ||
43 | { | ||
44 | - unsigned long size, cache_max_size = 64 * 1024 * 1024; | ||
45 | + unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size; | ||
46 | |||
47 | /* OK, so power of two buckets was too wasteful of memory. | ||
48 | * Give 3 other sizes between each power of two, to hopefully | ||
49 | @@ -3864,17 +3864,63 @@ init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
50 | * width/height alignment and rounding of sizes to pages will | ||
51 | * get us useful cache hit rates anyway) | ||
52 | */ | ||
53 | - add_bucket(bufmgr_gem, 4096); | ||
54 | - add_bucket(bufmgr_gem, 4096 * 2); | ||
55 | - add_bucket(bufmgr_gem, 4096 * 3); | ||
56 | + /* alloc_mode 0 is default alloc_mode | ||
57 | + * alloc_mode 1 rounding up to 64K for all < 1M | ||
58 | + * alloc_mode 2 rounding up to 2M for size> 1M | ||
59 | + * alloc_mode 3 rounding up to 2M for size > 1M and 64K for size <= 1M */ | ||
60 | + if( alloc_mode > 3 ) | ||
61 | + alloc_mode = 0; | ||
62 | + | ||
63 | + if ( 0 == alloc_mode || 2 == alloc_mode) | ||
64 | + { | ||
65 | + // < 1M normal alloc_mode | ||
66 | + add_bucket(bufmgr_gem, 4096); | ||
67 | + add_bucket(bufmgr_gem, 4096 * 2); | ||
68 | + add_bucket(bufmgr_gem, 4096 * 3); | ||
69 | + /* Initialize the linked lists for BO reuse cache. */ | ||
70 | + for (size = 4 * 4096; size < 1024 * 1024; size *= 2) { | ||
71 | + add_bucket(bufmgr_gem, size); | ||
72 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
73 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
74 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
75 | + } | ||
76 | |||
77 | - /* Initialize the linked lists for BO reuse cache. */ | ||
78 | - for (size = 4 * 4096; size <= cache_max_size; size *= 2) { | ||
79 | - add_bucket(bufmgr_gem, size); | ||
80 | + add_bucket(bufmgr_gem, 1024 * 1024); | ||
81 | + } | ||
82 | + if (1 == alloc_mode || 3 == alloc_mode) | ||
83 | + { | ||
84 | + // < 1M 64k alignment | ||
85 | + unit_size = 64 * 1024; | ||
86 | + for (size = unit_size; size <= 1024 * 1024; size += unit_size) | ||
87 | + { | ||
88 | + add_bucket(bufmgr_gem, size); | ||
89 | + } | ||
90 | + } | ||
91 | + if( 0 == alloc_mode || 1 == alloc_mode) | ||
92 | + { | ||
93 | + //> 1M is normal alloc_mode | ||
94 | + add_bucket(bufmgr_gem, 1280 * 1024); | ||
95 | + add_bucket(bufmgr_gem, 1536 * 1024); | ||
96 | + add_bucket(bufmgr_gem, 1792 * 1024); | ||
97 | + | ||
98 | + for (size = 2 * 1024 * 1024; size < cache_max_size; size *= 2) { | ||
99 | + add_bucket(bufmgr_gem, size); | ||
100 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
101 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
102 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
103 | + } | ||
104 | + } | ||
105 | + if( 2 == alloc_mode || 3 == alloc_mode) | ||
106 | + { | ||
107 | + //> 1M rolling to 2M | ||
108 | + unit_size = 2 * 1024 * 1024; | ||
109 | + add_bucket(bufmgr_gem, unit_size); | ||
110 | + add_bucket(bufmgr_gem, 3 * 1024 * 1024); | ||
111 | |||
112 | - add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
113 | - add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
114 | - add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
115 | + for (size = 4 * 1024 * 1024; size <= cache_max_size; size += unit_size) | ||
116 | + { | ||
117 | + add_bucket(bufmgr_gem, size); | ||
118 | + } | ||
119 | } | ||
120 | } | ||
121 | |||
122 | @@ -5100,6 +5146,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
123 | struct drm_i915_gem_get_aperture aperture; | ||
124 | drm_i915_getparam_t gp; | ||
125 | int ret, tmp; | ||
126 | + uint8_t alloc_mode; | ||
127 | bool exec2 = false; | ||
128 | |||
129 | pthread_mutex_lock(&bufmgr_list_mutex); | ||
130 | @@ -5352,10 +5399,12 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
131 | * | ||
132 | * Every 4 was too few for the blender benchmark. | ||
133 | */ | ||
134 | + alloc_mode = (uint8_t)(batch_size & 0xff); | ||
135 | + batch_size &= 0xffffff00; | ||
136 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
137 | |||
138 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
139 | - init_cache_buckets(bufmgr_gem); | ||
140 | + init_cache_buckets(bufmgr_gem,alloc_mode); | ||
141 | |||
142 | DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list); | ||
143 | |||
144 | diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
145 | index 90b5685b1..b3574f7d3 100644 | ||
146 | --- a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
147 | +++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
148 | @@ -5403,6 +5403,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
149 | * | ||
150 | * Every 4 was too few for the blender benchmark. | ||
151 | */ | ||
152 | + batch_size &= 0xffffff00; | ||
153 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
154 | |||
155 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
156 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
157 | index 9e9e3ff7e..543e262d1 100644 | ||
158 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
159 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
160 | @@ -64,6 +64,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
161 | uint32_t iDeviceId = 0; | ||
162 | MOS_STATUS eStatus = MOS_STATUS_SUCCESS; | ||
163 | uint32_t value = 0; | ||
164 | + uint32_t mode = 0; | ||
165 | MediaUserSettingSharedPtr userSettingPtr = nullptr; | ||
166 | |||
167 | MOS_OS_FUNCTION_ENTER; | ||
168 | @@ -89,7 +90,25 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
169 | |||
170 | userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext); | ||
171 | |||
172 | - m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType); | ||
173 | + mode = BATCH_BUFFER_SIZE; | ||
174 | + ReadUserSetting( | ||
175 | + userSettingPtr, | ||
176 | + value, | ||
177 | + "INTEL MEDIA ALLOC MODE", | ||
178 | + MediaUserSetting::Group::Device); | ||
179 | + | ||
180 | + if (value) | ||
181 | + { | ||
182 | + mode |= (value & 0x000000ff); | ||
183 | + } | ||
184 | + value = 0; | ||
185 | + /* no need to set batch buffer size after switch to softpin | ||
186 | + * keep it, just for test during relocation to softpin transition | ||
187 | + * now , it could be a debug method , but is actually useless | ||
188 | + * so it is safe to reuse the lowest 8bit to convey addtional information | ||
189 | + * more suitable solution is deleting it , or add additional parameter*/ | ||
190 | + | ||
191 | + m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType); | ||
192 | if (nullptr == m_bufmgr) | ||
193 | { | ||
194 | MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd); | ||
195 | diff --git a/media_softlet/linux/common/os/mos_user_setting_specific.cpp b/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
196 | index 6be8b4298..caed584f4 100644 | ||
197 | --- a/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
198 | +++ b/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
199 | @@ -52,5 +52,12 @@ MOS_STATUS MosUserSetting::InitMosUserSettingSpecific(MediaUserSettingSharedPtr | ||
200 | 0, | ||
201 | true); //"Enable VM Bind." | ||
202 | |||
203 | + DeclareUserSettingKey( | ||
204 | + userSettingPtr, | ||
205 | + "INTEL MEDIA ALLOC MODE", | ||
206 | + MediaUserSetting::Group::Device, | ||
207 | + 0, | ||
208 | + false); // | ||
209 | + | ||
210 | return MOS_STATUS_SUCCESS; | ||
211 | } | ||
212 | -- | ||
213 | 2.40.1 | ||
214 | |||
diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch deleted file mode 100644 index 459ff490..00000000 --- a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang_Pingli <pingli.wang@intel.com> | ||
3 | Date: Thu, 28 Dec 2023 16:44:40 +0800 | ||
4 | Subject: [PATCH 07/12] Skip report keys | ||
5 | |||
6 | Skip to report keys | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323] | ||
9 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../os/osservice/mos_utilities_specific.cpp | 30 +++++++++++++++++-- | ||
12 | 1 file changed, 28 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
15 | index b5df29f06..96785e21e 100644 | ||
16 | --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
17 | +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
18 | @@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0; | ||
19 | int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter; | ||
20 | #endif | ||
21 | |||
22 | +static bool s_skipToReportReg = false; | ||
23 | + | ||
24 | double MosUtilities::MosGetTime() | ||
25 | { | ||
26 | struct timespec ts = {}; | ||
27 | @@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
28 | { | ||
29 | std::string id = ""; | ||
30 | |||
31 | + static const char *disableReportRegKeyList[] = { | ||
32 | + "INTEL MEDIA ALLOC MODE" | ||
33 | + }; | ||
34 | + static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]); | ||
35 | while(!regStream.eof()) | ||
36 | { | ||
37 | std::string line = ""; | ||
38 | @@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
39 | { | ||
40 | std::string name = line.substr(0,pos); | ||
41 | std::string value = line.substr(pos+1); | ||
42 | - auto &keys = regBufferMap[id]; | ||
43 | - keys[name] = value; | ||
44 | + if (name.size() > 0 && value.size() > 0) | ||
45 | + { | ||
46 | + auto &keys = regBufferMap[id]; | ||
47 | + keys[name] = value; | ||
48 | + if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH) | ||
49 | + { | ||
50 | + for (uint32_t i = 0; i < disableReportRegKeyListCount; i++) | ||
51 | + { | ||
52 | + if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0) | ||
53 | + { | ||
54 | + s_skipToReportReg = true; | ||
55 | + break; | ||
56 | + } | ||
57 | + } | ||
58 | + } | ||
59 | + } | ||
60 | } | ||
61 | } | ||
62 | } | ||
63 | @@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
64 | MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap ®BufferMap) | ||
65 | { | ||
66 | MOS_STATUS status = MOS_STATUS_SUCCESS; | ||
67 | + | ||
68 | + if (s_skipToReportReg) | ||
69 | + { | ||
70 | + return MOS_STATUS_SUCCESS; | ||
71 | + } | ||
72 | + | ||
73 | if (regBufferMap.size() == 0) | ||
74 | { | ||
75 | return MOS_STATUS_SUCCESS; | ||
76 | -- | ||
77 | 2.40.1 | ||
78 | |||
diff --git a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch deleted file mode 100644 index ece5e00b..00000000 --- a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch +++ /dev/null | |||
@@ -1,255 +0,0 @@ | |||
1 | From ac2ffac8d4aade216cc361c6c7120c13a8780719 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Soon, Thean Siew" <thean.siew.soon@intel.com> | ||
3 | Date: Thu, 28 Dec 2023 18:42:59 +0000 | ||
4 | Subject: [PATCH 08/12] Limit INTEL MEDIA ALLOC MODE to MTL and ARL only | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754] | ||
7 | |||
8 | Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com> | ||
9 | --- | ||
10 | .../common/os/i915/include/mos_bufmgr_api.h | 1 + | ||
11 | .../common/os/i915/include/mos_bufmgr_priv.h | 2 +- | ||
12 | .../linux/common/os/i915/mos_bufmgr.c | 69 +++++++++++++++---- | ||
13 | .../linux/common/os/i915/mos_bufmgr_api.c | 19 +++++ | ||
14 | .../os/i915_production/mos_bufmgr_priv.h | 1 + | ||
15 | .../common/os/mos_context_specific_next.cpp | 36 +++++----- | ||
16 | 6 files changed, 94 insertions(+), 34 deletions(-) | ||
17 | |||
18 | diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
19 | index 71cc01099..ab4f1ba89 100644 | ||
20 | --- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
21 | +++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
22 | @@ -299,6 +299,7 @@ void mos_bufmgr_enable_vmbind(struct mos_bufmgr *bufmgr); | ||
23 | void mos_bufmgr_disable_object_capture(struct mos_bufmgr *bufmgr); | ||
24 | int mos_bufmgr_get_memory_info(struct mos_bufmgr *bufmgr, char *info, uint32_t length); | ||
25 | int mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr); | ||
26 | +void mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode); | ||
27 | |||
28 | int mos_bo_map_unsynchronized(struct mos_linux_bo *bo); | ||
29 | int mos_bo_map_gtt(struct mos_linux_bo *bo); | ||
30 | diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
31 | index 63f69f985..6fd58f827 100644 | ||
32 | --- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
33 | +++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
34 | @@ -358,9 +358,9 @@ struct mos_bufmgr { | ||
35 | void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr; | ||
36 | int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr; | ||
37 | int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr; | ||
38 | + void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr; | ||
39 | int (*query_engines_count)(struct mos_bufmgr *bufmgr, | ||
40 | unsigned int *nengine) = nullptr; | ||
41 | - | ||
42 | int (*query_engines)(struct mos_bufmgr *bufmgr, | ||
43 | __u16 engine_class, | ||
44 | __u64 caps, | ||
45 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
46 | index b623d0129..2814ddbb7 100644 | ||
47 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
48 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
49 | @@ -2426,19 +2426,9 @@ mos_gem_bo_start_gtt_access(struct mos_linux_bo *bo, int write_enable) | ||
50 | } | ||
51 | |||
52 | static void | ||
53 | -mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
54 | +mos_bufmgr_cleanup_cache(struct mos_bufmgr_gem *bufmgr_gem) | ||
55 | { | ||
56 | - struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *) bufmgr; | ||
57 | - struct drm_gem_close close_bo; | ||
58 | - int i, ret; | ||
59 | - | ||
60 | - free(bufmgr_gem->exec2_objects); | ||
61 | - free(bufmgr_gem->exec_objects); | ||
62 | - free(bufmgr_gem->exec_bos); | ||
63 | - pthread_mutex_destroy(&bufmgr_gem->lock); | ||
64 | - | ||
65 | - /* Free any cached buffer objects we were going to reuse */ | ||
66 | - for (i = 0; i < bufmgr_gem->num_buckets; i++) { | ||
67 | + for (int i = 0; i < bufmgr_gem->num_buckets; i++) { | ||
68 | struct mos_gem_bo_bucket *bucket = | ||
69 | &bufmgr_gem->cache_bucket[i]; | ||
70 | struct mos_bo_gem *bo_gem; | ||
71 | @@ -2450,7 +2440,25 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
72 | |||
73 | mos_gem_bo_free(&bo_gem->bo); | ||
74 | } | ||
75 | + bufmgr_gem->cache_bucket[i].size = 0; | ||
76 | } | ||
77 | + bufmgr_gem->num_buckets = 0; | ||
78 | +} | ||
79 | + | ||
80 | +static void | ||
81 | +mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
82 | +{ | ||
83 | + struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr; | ||
84 | + struct drm_gem_close close_bo; | ||
85 | + int ret; | ||
86 | + | ||
87 | + free(bufmgr_gem->exec2_objects); | ||
88 | + free(bufmgr_gem->exec_objects); | ||
89 | + free(bufmgr_gem->exec_bos); | ||
90 | + pthread_mutex_destroy(&bufmgr_gem->lock); | ||
91 | + | ||
92 | + /* Free any cached buffer objects we were going to reuse */ | ||
93 | + mos_bufmgr_cleanup_cache(bufmgr_gem); | ||
94 | |||
95 | /* Release userptr bo kept hanging around for optimisation. */ | ||
96 | if (bufmgr_gem->userptr_active.ptr) { | ||
97 | @@ -3852,9 +3860,41 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size) | ||
98 | } | ||
99 | |||
100 | static void | ||
101 | -init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode) | ||
102 | +init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
103 | +{ | ||
104 | + unsigned long size, cache_max_size = 64 * 1024 * 1024; | ||
105 | + | ||
106 | + /* OK, so power of two buckets was too wasteful of memory. | ||
107 | + * Give 3 other sizes between each power of two, to hopefully | ||
108 | + * cover things accurately enough. (The alternative is | ||
109 | + * probably to just go for exact matching of sizes, and assume | ||
110 | + * that for things like composited window resize the tiled | ||
111 | + * width/height alignment and rounding of sizes to pages will | ||
112 | + * get us useful cache hit rates anyway) | ||
113 | + */ | ||
114 | + add_bucket(bufmgr_gem, 4096); | ||
115 | + add_bucket(bufmgr_gem, 4096 * 2); | ||
116 | + add_bucket(bufmgr_gem, 4096 * 3); | ||
117 | + | ||
118 | + /* Initialize the linked lists for BO reuse cache. */ | ||
119 | + for (size = 4 * 4096; size <= cache_max_size; size *= 2) { | ||
120 | + add_bucket(bufmgr_gem, size); | ||
121 | + | ||
122 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
123 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
124 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
125 | + } | ||
126 | +} | ||
127 | + | ||
128 | +static void | ||
129 | +mos_gem_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) | ||
130 | { | ||
131 | unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size; | ||
132 | + struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr; | ||
133 | + | ||
134 | + // Clean up the pre-allocated cache before re-allocating according | ||
135 | + // to alloc_mode | ||
136 | + mos_bufmgr_cleanup_cache(bufmgr_gem); | ||
137 | |||
138 | /* OK, so power of two buckets was too wasteful of memory. | ||
139 | * Give 3 other sizes between each power of two, to hopefully | ||
140 | @@ -5218,6 +5258,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
141 | bufmgr_gem->bufmgr.disable_object_capture = mos_gem_disable_object_capture; | ||
142 | bufmgr_gem->bufmgr.get_memory_info = mos_gem_get_memory_info; | ||
143 | bufmgr_gem->bufmgr.get_devid = mos_gem_get_devid; | ||
144 | + bufmgr_gem->bufmgr.realloc_cache = mos_gem_realloc_cache; | ||
145 | bufmgr_gem->bufmgr.set_context_param = mos_gem_set_context_param; | ||
146 | bufmgr_gem->bufmgr.set_context_param_parallel = mos_gem_set_context_param_parallel; | ||
147 | bufmgr_gem->bufmgr.set_context_param_load_balance = mos_gem_set_context_param_load_balance; | ||
148 | @@ -5404,7 +5445,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
149 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
150 | |||
151 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
152 | - init_cache_buckets(bufmgr_gem,alloc_mode); | ||
153 | + init_cache_buckets(bufmgr_gem); | ||
154 | |||
155 | DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list); | ||
156 | |||
157 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
158 | index abe8ef96a..d0e02c267 100644 | ||
159 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
160 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
161 | @@ -1204,6 +1204,25 @@ mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr) | ||
162 | } | ||
163 | } | ||
164 | |||
165 | +void | ||
166 | +mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) | ||
167 | +{ | ||
168 | + if(!bufmgr) | ||
169 | + { | ||
170 | + MOS_OS_CRITICALMESSAGE("Input null ptr\n"); | ||
171 | + return; | ||
172 | + } | ||
173 | + | ||
174 | + if (bufmgr->realloc_cache) | ||
175 | + { | ||
176 | + return bufmgr->realloc_cache(bufmgr, alloc_mode); | ||
177 | + } | ||
178 | + else | ||
179 | + { | ||
180 | + MOS_OS_CRITICALMESSAGE("Unsupported\n"); | ||
181 | + } | ||
182 | +} | ||
183 | + | ||
184 | int | ||
185 | mos_query_engines_count(struct mos_bufmgr *bufmgr, | ||
186 | unsigned int *nengine) | ||
187 | diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
188 | index c3b765a4c..1d7f7edb0 100644 | ||
189 | --- a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
190 | +++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
191 | @@ -358,6 +358,7 @@ struct mos_bufmgr { | ||
192 | void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr; | ||
193 | int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr; | ||
194 | int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr; | ||
195 | + void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr; | ||
196 | int (*query_engines_count)(struct mos_bufmgr *bufmgr, | ||
197 | unsigned int *nengine) = nullptr; | ||
198 | |||
199 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
200 | index 543e262d1..87059f538 100644 | ||
201 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
202 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
203 | @@ -90,25 +90,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
204 | |||
205 | userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext); | ||
206 | |||
207 | - mode = BATCH_BUFFER_SIZE; | ||
208 | - ReadUserSetting( | ||
209 | - userSettingPtr, | ||
210 | - value, | ||
211 | - "INTEL MEDIA ALLOC MODE", | ||
212 | - MediaUserSetting::Group::Device); | ||
213 | - | ||
214 | - if (value) | ||
215 | - { | ||
216 | - mode |= (value & 0x000000ff); | ||
217 | - } | ||
218 | - value = 0; | ||
219 | - /* no need to set batch buffer size after switch to softpin | ||
220 | - * keep it, just for test during relocation to softpin transition | ||
221 | - * now , it could be a debug method , but is actually useless | ||
222 | - * so it is safe to reuse the lowest 8bit to convey addtional information | ||
223 | - * more suitable solution is deleting it , or add additional parameter*/ | ||
224 | - | ||
225 | - m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType); | ||
226 | + m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType); | ||
227 | if (nullptr == m_bufmgr) | ||
228 | { | ||
229 | MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd); | ||
230 | @@ -151,6 +133,22 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
231 | return eStatus; | ||
232 | } | ||
233 | |||
234 | + if (m_platformInfo.eProductFamily == IGFX_METEORLAKE || | ||
235 | + m_platformInfo.eProductFamily == IGFX_ARROWLAKE) | ||
236 | + { | ||
237 | + ReadUserSetting( | ||
238 | + userSettingPtr, | ||
239 | + value, | ||
240 | + "INTEL MEDIA ALLOC MODE", | ||
241 | + MediaUserSetting::Group::Device); | ||
242 | + | ||
243 | + if (value) | ||
244 | + { | ||
245 | + mode = (value & 0x000000ff); | ||
246 | + } | ||
247 | + mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
248 | + } | ||
249 | + | ||
250 | ReadUserSetting( | ||
251 | userSettingPtr, | ||
252 | value, | ||
253 | -- | ||
254 | 2.40.1 | ||
255 | |||
diff --git a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch deleted file mode 100644 index 8ee7ef14..00000000 --- a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 18c32247cbc0e9fabff7a847add099496af9e53f Mon Sep 17 00:00:00 2001 | ||
2 | From: "Soon, Thean Siew" <thean.siew.soon@intel.com> | ||
3 | Date: Mon, 8 Jan 2024 18:12:30 +0000 | ||
4 | Subject: [PATCH 09/12] Skip cache bucket realloc for default mode 0 | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754] | ||
7 | |||
8 | Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com> | ||
9 | --- | ||
10 | .../linux/common/os/mos_context_specific_next.cpp | 7 ++++++- | ||
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
14 | index 87059f538..9dbd5da79 100644 | ||
15 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
16 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
17 | @@ -146,7 +146,12 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
18 | { | ||
19 | mode = (value & 0x000000ff); | ||
20 | } | ||
21 | - mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
22 | + | ||
23 | + // Realloc cache only if it's not mode 0 | ||
24 | + if (mode) | ||
25 | + { | ||
26 | + mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
27 | + } | ||
28 | } | ||
29 | |||
30 | ReadUserSetting( | ||
31 | -- | ||
32 | 2.40.1 | ||
33 | |||
diff --git a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch deleted file mode 100644 index 0100df77..00000000 --- a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch +++ /dev/null | |||
@@ -1,195 +0,0 @@ | |||
1 | From 7291ab5206c5e172c6c94dcfbe4f1bc258f3b7a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: WenshengZhang <wensheng.zhang@intel.com> | ||
3 | Date: Wed, 10 Jan 2024 14:08:37 +0800 | ||
4 | Subject: [PATCH 10/12] Fix failed 4k video wall test case and color corruption | ||
5 | of video composition | ||
6 | |||
7 | Fix failed 4k video wall test case from 16CH video only show 1CH output and | ||
8 | corruption observed on certain number of video composition when doing | ||
9 | sample_multi_transcode. | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/38e14b1b97170b51586d00d1fa607e496b0c5825] | ||
12 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
13 | --- | ||
14 | .../common/vp/kdll/hal_kerneldll_next.h | 1 + | ||
15 | .../vp/hal/packet/vp_render_fc_kernel.cpp | 7 ++ | ||
16 | .../common/vp/kdll/hal_kerneldll_next.c | 70 +++++++++++-------- | ||
17 | .../linux/common/vp/ddi/ddi_vp_functions.cpp | 20 ++---- | ||
18 | 4 files changed, 55 insertions(+), 43 deletions(-) | ||
19 | |||
20 | diff --git a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
21 | index 6447999b7..8e2ab371e 100644 | ||
22 | --- a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
23 | +++ b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
24 | @@ -588,6 +588,7 @@ typedef struct tagKdll_FilterEntry | ||
25 | Kdll_Scalingratio ScalingRatio; | ||
26 | Kdll_RenderMethod RenderMethod; | ||
27 | Kdll_SetCSCCoeffMethod SetCSCCoeffMode; | ||
28 | + bool forceToTargetColorSpace; | ||
29 | } Kdll_FilterEntry, *PKdll_FilterEntry; | ||
30 | |||
31 | // Structure that defines a compositing filter | ||
32 | diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
33 | index 8e982f67e..f8308fed1 100644 | ||
34 | --- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
35 | +++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
36 | @@ -775,6 +775,13 @@ MOS_STATUS VpRenderFcKernel::BuildFilter( | ||
37 | |||
38 | for (i = 0; (i < (int)compParams->sourceCount) && (iMaxFilterSize > 0); i++) | ||
39 | { | ||
40 | + if (i > 0) | ||
41 | + { | ||
42 | + if (!RECT1_CONTAINS_RECT2(compParams->source[0].surf->rcDst, compParams->source[i].surf->rcDst)) | ||
43 | + { | ||
44 | + pFilter->forceToTargetColorSpace = true; | ||
45 | + } | ||
46 | + } | ||
47 | src = &compParams->source[i]; | ||
48 | |||
49 | //-------------------------------- | ||
50 | diff --git a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
51 | index d8f7d429a..151f3b039 100644 | ||
52 | --- a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
53 | +++ b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
54 | @@ -2378,6 +2378,7 @@ bool KernelDll_SetupCSC( | ||
55 | Kdll_CSC_Matrix curr_matrix; | ||
56 | Kdll_CSC_Matrix *matrix = pCSC->Matrix; // Color Space conversion matrix | ||
57 | uint8_t * matrixID = pCSC->MatrixID; // CSC coefficient allocation table | ||
58 | + bool forceToTargetColorSpace = false; | ||
59 | |||
60 | // Clear all CSC matrices | ||
61 | MOS_ZeroMemory(matrix, sizeof(pCSC->Matrix)); | ||
62 | @@ -2395,6 +2396,10 @@ bool KernelDll_SetupCSC( | ||
63 | //---------------------------------------------------------------// | ||
64 | for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
65 | { | ||
66 | + if (pFilter->forceToTargetColorSpace) | ||
67 | + { | ||
68 | + forceToTargetColorSpace = true; | ||
69 | + } | ||
70 | // Disable Procamp for all layers except Main Video | ||
71 | // Disable Procamp if source is RGB | ||
72 | if (pFilter->layer != Layer_MainVideo || | ||
73 | @@ -2456,44 +2461,51 @@ bool KernelDll_SetupCSC( | ||
74 | //---------------------------------------------------------------// | ||
75 | if (sel_cspace == CSpace_Any) | ||
76 | { | ||
77 | - int cs; | ||
78 | - for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++) | ||
79 | + if (forceToTargetColorSpace) | ||
80 | { | ||
81 | - // Skip color spaces not in use | ||
82 | - cspace = (VPHAL_CSPACE)cs; | ||
83 | - if (!cspace_in_use[cspace]) | ||
84 | - { | ||
85 | - continue; | ||
86 | - } | ||
87 | - | ||
88 | - // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I) | ||
89 | - cspace = KernelDll_TranslateCspace(cspace); | ||
90 | - | ||
91 | - // Count # of CS conversions and matrices | ||
92 | - csc_count = 0; | ||
93 | - for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
94 | + sel_cspace = out_cspace; | ||
95 | + } | ||
96 | + else | ||
97 | + { | ||
98 | + int cs; | ||
99 | + for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++) | ||
100 | { | ||
101 | - // Ignore layers where the Color Space may be set in software (colorfill, palletized) | ||
102 | - if (pFilter->cspace == CSpace_Any) | ||
103 | + // Skip color spaces not in use | ||
104 | + cspace = (VPHAL_CSPACE)cs; | ||
105 | + if (!cspace_in_use[cspace]) | ||
106 | { | ||
107 | continue; | ||
108 | } | ||
109 | |||
110 | - // Check if CSC/PA is required | ||
111 | - if (KernelDll_TranslateCspace(pFilter->cspace) != cspace || | ||
112 | - pFilter->procamp != DL_PROCAMP_DISABLED) | ||
113 | + // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I) | ||
114 | + cspace = KernelDll_TranslateCspace(cspace); | ||
115 | + | ||
116 | + // Count # of CS conversions and matrices | ||
117 | + csc_count = 0; | ||
118 | + for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
119 | { | ||
120 | - csc_count++; | ||
121 | + // Ignore layers where the Color Space may be set in software (colorfill, palletized) | ||
122 | + if (pFilter->cspace == CSpace_Any) | ||
123 | + { | ||
124 | + continue; | ||
125 | + } | ||
126 | + | ||
127 | + // Check if CSC/PA is required | ||
128 | + if (KernelDll_TranslateCspace(pFilter->cspace) != cspace || | ||
129 | + pFilter->procamp != DL_PROCAMP_DISABLED) | ||
130 | + { | ||
131 | + csc_count++; | ||
132 | + } | ||
133 | } | ||
134 | - } | ||
135 | |||
136 | - // Save best choice as requiring minimum number of CSC operations | ||
137 | - if ((sel_csc_count < 0) || // Initial value | ||
138 | - (csc_count < sel_csc_count) || // Minimum number of CSC operations | ||
139 | - (csc_count == sel_csc_count && cs == main_cspace)) // Use main cspace as default if same CSC count | ||
140 | - { | ||
141 | - sel_cspace = cspace; | ||
142 | - sel_csc_count = csc_count; | ||
143 | + // Save best choice as requiring minimum number of CSC operations | ||
144 | + if ((sel_csc_count < 0) || // Initial value | ||
145 | + (csc_count < sel_csc_count) || // Minimum number of CSC operations | ||
146 | + (csc_count == sel_csc_count && cs == main_cspace)) // Use main cspace as default if same CSC count | ||
147 | + { | ||
148 | + sel_cspace = cspace; | ||
149 | + sel_csc_count = csc_count; | ||
150 | + } | ||
151 | } | ||
152 | } | ||
153 | } | ||
154 | diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
155 | index 40d0b3fad..e60a6c69c 100644 | ||
156 | --- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
157 | +++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
158 | @@ -2115,9 +2115,8 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
159 | { | ||
160 | DDI_VP_FUNC_ENTER; | ||
161 | DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
162 | - DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
163 | |||
164 | - if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB) | ||
165 | + if ((outBackGroundcolor >> 24) != 0) | ||
166 | { | ||
167 | if (vpHalRenderParams->pColorFillParams == nullptr) | ||
168 | { | ||
169 | @@ -2126,18 +2125,11 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
170 | |||
171 | DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN); | ||
172 | |||
173 | - if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0) | ||
174 | - { | ||
175 | - // set color space for sRGB output | ||
176 | - vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
177 | - } | ||
178 | - else | ||
179 | - { | ||
180 | - // set background colorfill option | ||
181 | - vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
182 | - vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
183 | - vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
184 | - } | ||
185 | + // set background colorfill option | ||
186 | + vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
187 | + vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
188 | + vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
189 | + | ||
190 | } | ||
191 | else | ||
192 | { | ||
193 | -- | ||
194 | 2.40.1 | ||
195 | |||
diff --git a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch deleted file mode 100644 index 2f4aec1e..00000000 --- a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From f8b4d982232d4c1330e1e5f5dcd7cd8ca94decba Mon Sep 17 00:00:00 2001 | ||
2 | From: WenshengZhang <wensheng.zhang@intel.com> | ||
3 | Date: Thu, 25 Jan 2024 16:35:10 +0800 | ||
4 | Subject: [PATCH 11/12] Disable 422H format output | ||
5 | |||
6 | Disable 422H format output. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/eab411768e61a46e096793291f5f992eecf76cd8] | ||
9 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../agnostic/common/vp/hal/feature_manager/policy.cpp | 6 ++++++ | ||
12 | 1 file changed, 6 insertions(+) | ||
13 | |||
14 | diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
15 | index 317cec25a..12f1124fa 100644 | ||
16 | --- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
17 | +++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
18 | @@ -1140,6 +1140,12 @@ MOS_STATUS Policy::GetScalingExecutionCaps(SwFilter *feature, bool isHdrEnabled) | ||
19 | bool isAlphaSettingSupportedByVebox = | ||
20 | IsAlphaSettingSupportedByVebox(scalingParams->formatInput, scalingParams->formatOutput, scalingParams->pCompAlpha); | ||
21 | |||
22 | + if (scalingParams->formatOutput == Format_422H) | ||
23 | + { | ||
24 | + VP_PUBLIC_ASSERTMESSAGE("Scaling not support 422H format output."); | ||
25 | + return MOS_STATUS_UNIMPLEMENTED; | ||
26 | + } | ||
27 | + | ||
28 | // Clean usedForNextPass flag. | ||
29 | if (scalingEngine->usedForNextPass) | ||
30 | { | ||
31 | -- | ||
32 | 2.40.1 | ||
33 | |||
diff --git a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch deleted file mode 100644 index 1be9139d..00000000 --- a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From b93904533d3ee66c7919fa8e23d26b852a37a917 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
3 | Date: Tue, 30 Jan 2024 13:27:52 +0800 | ||
4 | Subject: [PATCH 12/12] [Decode] Fix AVC decode SFC 4K hang issue | ||
5 | |||
6 | Updated VDSFC input width and height for AVC decode | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/intel-innersource/drivers.gpu.unified/pull/151401] | ||
9 | |||
10 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
11 | --- | ||
12 | .../hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
16 | index e75fd8137..9cc236bd7 100644 | ||
17 | --- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
18 | +++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
19 | @@ -59,6 +59,10 @@ MOS_STATUS AvcDownSamplingPkt::InitSfcParams(VDBOX_SFC_PARAMS &sfcParams) | ||
20 | |||
21 | AvcBasicFeature *avcBasicFeature = dynamic_cast<AvcBasicFeature*>(m_basicFeature); | ||
22 | DECODE_CHK_NULL(avcBasicFeature); | ||
23 | + | ||
24 | + sfcParams.input.width = avcBasicFeature->m_width; | ||
25 | + sfcParams.input.height = avcBasicFeature->m_height; | ||
26 | + | ||
27 | CODEC_PICTURE curPic = avcBasicFeature->m_avcPicParams->CurrPic; | ||
28 | |||
29 | if (avcBasicFeature->m_avcPicParams->seq_fields.mb_adaptive_frame_field_flag == true) | ||
30 | -- | ||
31 | 2.40.1 | ||
32 | |||
diff --git a/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch new file mode 100644 index 00000000..17b2d635 --- /dev/null +++ b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch | |||
@@ -0,0 +1,154 @@ | |||
1 | From 8aa866dc650e6b0e0b7425bafc7b1039232c377a Mon Sep 17 00:00:00 2001 | ||
2 | From: "Xu, Zhengguo" <zhengguo.xu@intel.com> | ||
3 | Date: Tue, 16 Apr 2024 09:53:41 +0800 | ||
4 | Subject: [PATCH] [Decode] Correct condition check when dump avc mv buffer | ||
5 | |||
6 | Fixes: #1791 | ||
7 | Signed-off-by: Xu, Zhengguo <zhengguo.xu@intel.com> | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/8aa866dc650e6b0e0b7425bafc7b1039232c377a] | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | .../common/codec/hal/codechal_decode_avc.cpp | 33 ++++++++----------- | ||
13 | .../decode_avc_picture_xe_m_base_packet.cpp | 28 +++++++--------- | ||
14 | .../avc/packet/decode_avc_picture_packet.cpp | 30 +++++++---------- | ||
15 | 3 files changed, 37 insertions(+), 54 deletions(-) | ||
16 | |||
17 | diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp | ||
18 | index 3adf6994ce..4bac426802 100644 | ||
19 | --- a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp | ||
20 | +++ b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp | ||
21 | @@ -1619,28 +1619,23 @@ MOS_STATUS CodechalDecodeAvc::InitPicMhwParams( | ||
22 | uint8_t picID = picMhwParams->AvcDirectmodeParams.bPicIdRemappingInUse ? i : refList[idx]->ucFrameId; | ||
23 | uint8_t mvIdx = refList[idx]->ucDMVIdx[0]; | ||
24 | |||
25 | - if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[i] != nullptr) | ||
26 | - { | ||
27 | - // dump Reference mvdata | ||
28 | - std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i); | ||
29 | - CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer( | ||
30 | - &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx], | ||
31 | - CodechalDbgAttr::attrMvData, | ||
32 | - mvBufDumpName.c_str(), | ||
33 | - m_avcDmvBufferSize)); | ||
34 | - } | ||
35 | + // dump Reference mvdata | ||
36 | + std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i); | ||
37 | + CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer( | ||
38 | + &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx], | ||
39 | + CodechalDbgAttr::attrMvData, | ||
40 | + mvBufDumpName.c_str(), | ||
41 | + m_avcDmvBufferSize)); | ||
42 | } | ||
43 | } | ||
44 | |||
45 | - if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx]) | ||
46 | - { | ||
47 | - // dump Current mvdata | ||
48 | - CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer( | ||
49 | - &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx], | ||
50 | - CodechalDbgAttr::attrMvData, | ||
51 | - "DEC_Cur_MV_", | ||
52 | - m_avcDmvBufferSize)); | ||
53 | - }); | ||
54 | + // dump Current mvdata | ||
55 | + CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer( | ||
56 | + &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx], | ||
57 | + CodechalDbgAttr::attrMvData, | ||
58 | + "DEC_Cur_MV_", | ||
59 | + m_avcDmvBufferSize)); | ||
60 | + ); | ||
61 | |||
62 | return eStatus; | ||
63 | } | ||
64 | diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp | ||
65 | index bd0611f6fa..035a7e6149 100644 | ||
66 | --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp | ||
67 | +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp | ||
68 | @@ -589,26 +589,20 @@ namespace decode{ | ||
69 | { | ||
70 | if (m_avcBasicFeature->m_refFrames.m_avcPicIdx[n].bValid) | ||
71 | { | ||
72 | - if (&avcDirectmodeParams.presAvcDmvBuffers[n+1] != nullptr) | ||
73 | - { | ||
74 | - std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n); | ||
75 | - DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
76 | - &avcDirectmodeParams.presAvcDmvBuffers[n+1], | ||
77 | - CodechalDbgAttr::attrMvData, | ||
78 | - mvBufDumpName.c_str(), | ||
79 | - mvBufferSize)); | ||
80 | - } | ||
81 | + std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n); | ||
82 | + DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
83 | + &avcDirectmodeParams.presAvcDmvBuffers[n+1], | ||
84 | + CodechalDbgAttr::attrMvData, | ||
85 | + mvBufDumpName.c_str(), | ||
86 | + mvBufferSize)); | ||
87 | } | ||
88 | } | ||
89 | |||
90 | - if (&avcDirectmodeParams.presAvcDmvBuffers[0] != nullptr) | ||
91 | - { | ||
92 | - DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
93 | - &avcDirectmodeParams.presAvcDmvBuffers[0], | ||
94 | - CodechalDbgAttr::attrMvData, | ||
95 | - "DEC_Cur_MV_", | ||
96 | - mvBufferSize)); | ||
97 | - } | ||
98 | + DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
99 | + &avcDirectmodeParams.presAvcDmvBuffers[0], | ||
100 | + CodechalDbgAttr::attrMvData, | ||
101 | + "DEC_Cur_MV_", | ||
102 | + mvBufferSize)); | ||
103 | return MOS_STATUS_SUCCESS; | ||
104 | } | ||
105 | |||
106 | diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp | ||
107 | index 88ed0bb832..8cdc05e585 100644 | ||
108 | --- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp | ||
109 | +++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp | ||
110 | @@ -646,26 +646,20 @@ MOS_STATUS AvcDecodePicPkt::DumpResources(uint32_t mvBufferSize) const | ||
111 | CodechalDbgAttr::attrDecodeReferenceSurfaces, | ||
112 | refSurfName.c_str())); | ||
113 | |||
114 | - if (&mvParam.presAvcDmvBuffers[n+1] != nullptr) | ||
115 | - { | ||
116 | - std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n); | ||
117 | - DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
118 | - &mvParam.presAvcDmvBuffers[n+1], | ||
119 | - CodechalDbgAttr::attrMvData, | ||
120 | - mvBufDumpName.c_str(), | ||
121 | - mvBufferSize)); | ||
122 | - } | ||
123 | + std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n); | ||
124 | + DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
125 | + &mvParam.presAvcDmvBuffers[n+1], | ||
126 | + CodechalDbgAttr::attrMvData, | ||
127 | + mvBufDumpName.c_str(), | ||
128 | + mvBufferSize)); | ||
129 | } | ||
130 | } | ||
131 | |||
132 | - if (&mvParam.presAvcDmvBuffers[0] != nullptr) | ||
133 | - { | ||
134 | - DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
135 | - &mvParam.presAvcDmvBuffers[0], | ||
136 | - CodechalDbgAttr::attrMvData, | ||
137 | - "DEC_Cur_MV_", | ||
138 | - mvBufferSize)); | ||
139 | - } | ||
140 | + DECODE_CHK_STATUS(debugInterface->DumpBuffer( | ||
141 | + &mvParam.presAvcDmvBuffers[0], | ||
142 | + CodechalDbgAttr::attrMvData, | ||
143 | + "DEC_Cur_MV_", | ||
144 | + mvBufferSize)); | ||
145 | |||
146 | return MOS_STATUS_SUCCESS; | ||
147 | } | ||
148 | @@ -699,4 +693,4 @@ MOS_STATUS AvcDecodePicPkt::SetSurfaceMmcState() const | ||
149 | return MOS_STATUS_SUCCESS; | ||
150 | } | ||
151 | |||
152 | -} // namespace decode | ||
153 | \ No newline at end of file | ||
154 | +} // namespace decode | ||
diff --git a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb index 6513d574..79f9887d 100644 --- a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb +++ b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb | |||
@@ -21,18 +21,10 @@ DEPENDS += "libva gmmlib" | |||
21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ | 21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ |
22 | file://0001-Disable-vp9-padding-on-mtl.patch \ | 22 | file://0001-Disable-vp9-padding-on-mtl.patch \ |
23 | file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \ | 23 | file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \ |
24 | file://0004-Add-device-ID-for-ARL.patch \ | 24 | file://8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch \ |
25 | file://0005-Add-XR24-support-to-DMABuf.patch \ | ||
26 | file://0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch \ | ||
27 | file://0007-Skip-report-keys.patch \ | ||
28 | file://0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch \ | ||
29 | file://0009-Skip-cache-bucket-realloc-for-default-mode-0.patch \ | ||
30 | file://0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch \ | ||
31 | file://0011-Disable-422H-format-output.patch \ | ||
32 | file://0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch \ | ||
33 | " | 25 | " |
34 | 26 | ||
35 | SRCREV = "a9f272496fc0f3e823cc4a814666ea27b443d902" | 27 | SRCREV = "8068c2e119ba16c017e5a5f443fac5a55edbee65" |
36 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
37 | 29 | ||
38 | COMPATIBLE_HOST:x86-x32 = "null" | 30 | COMPATIBLE_HOST:x86-x32 = "null" |
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch deleted file mode 100644 index 8d1f3380..00000000 --- a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 18 Dec 2023 09:58:35 +0800 | ||
4 | Subject: [PATCH] ARLH DID open source (#6286) | ||
5 | |||
6 | Co-authored-by: huangli <li.h.huang@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | |||
11 | --- | ||
12 | _studio/shared/include/mfxstructures-int.h | 7 ++++++- | ||
13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h | ||
16 | index 363d9a63..8f16b0a8 100644 | ||
17 | --- a/_studio/shared/include/mfxstructures-int.h | ||
18 | +++ b/_studio/shared/include/mfxstructures-int.h | ||
19 | @@ -1,4 +1,4 @@ | ||
20 | -// Copyright (c) 2007-2021 Intel Corporation | ||
21 | +// Copyright (c) 2007-2023 Intel Corporation | ||
22 | // | ||
23 | // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
24 | // of this software and associated documentation files (the "Software"), to deal | ||
25 | @@ -569,6 +569,11 @@ typedef struct { | ||
26 | /* ARL S */ | ||
27 | { 0x7D67, MFX_HW_ARL, MFX_GT2 }, | ||
28 | |||
29 | + /* ARL H*/ | ||
30 | + { 0x7D51, MFX_HW_ARL, MFX_GT2 }, | ||
31 | + { 0x7DD1, MFX_HW_ARL, MFX_GT2 }, | ||
32 | + { 0x7D41, MFX_HW_ARL, MFX_GT2 }, | ||
33 | + | ||
34 | }; | ||
35 | |||
36 | /* | ||
37 | -- | ||
38 | 2.40.1 | ||
39 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch deleted file mode 100644 index 8e014c97..00000000 --- a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Wed, 21 Feb 2024 17:11:52 +0800 | ||
4 | Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475) | ||
5 | |||
6 | Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
7 | Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a] | ||
10 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
11 | --- | ||
12 | _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
16 | index 2cad86f8..fd5fc269 100644 | ||
17 | --- a/_studio/shared/src/libmfx_core_vaapi.cpp | ||
18 | +++ b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
19 | @@ -462,8 +462,8 @@ public: | ||
20 | } | ||
21 | else | ||
22 | { | ||
23 | - eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
24 | - eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2); | ||
25 | + eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]); | ||
26 | + eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
27 | } | ||
28 | eb.num_planes = 3; | ||
29 | eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2); | ||
30 | -- | ||
31 | 2.40.1 | ||
32 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch deleted file mode 100644 index e3854407..00000000 --- a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 5 Feb 2024 17:14:07 +0800 | ||
4 | Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470) | ||
5 | |||
6 | Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | 6 ++++-- | ||
12 | .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | 9 +++++---- | ||
13 | 2 files changed, 9 insertions(+), 6 deletions(-) | ||
14 | |||
15 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
16 | index 141564b1..332f6372 100644 | ||
17 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
18 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
19 | @@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription( | ||
20 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12; | ||
21 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2; | ||
22 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4; | ||
23 | - memCaps.NumColorFormats = 4; | ||
24 | + ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4; | ||
25 | + memCaps.NumColorFormats = 5; | ||
26 | |||
27 | ah.PushBack(profileCaps.MemDesc); | ||
28 | profileCaps.MemDesc[1] = profileCaps.MemDesc[0]; | ||
29 | @@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx | ||
30 | if ((fourCC == 0 && chromaFormat == 0) || | ||
31 | (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) || | ||
32 | (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) || | ||
33 | - (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
34 | + ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
35 | { | ||
36 | out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC; | ||
37 | out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat; | ||
38 | @@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par) | ||
39 | doubleBytesPerPx = 4; | ||
40 | break; | ||
41 | case MFX_FOURCC_RGB4: | ||
42 | + case MFX_FOURCC_BGR4: | ||
43 | default: | ||
44 | doubleBytesPerPx = 8; | ||
45 | break; | ||
46 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
47 | index 3fc619d1..b1ab556e 100644 | ||
48 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
49 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
50 | @@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par, | ||
51 | BytesPerPx = 2; | ||
52 | break; | ||
53 | case MFX_FOURCC_RGB4: | ||
54 | + case MFX_FOURCC_BGR4: | ||
55 | default: | ||
56 | BytesPerPx = 4; | ||
57 | } | ||
58 | @@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
59 | |||
60 | m_payload_base.length = 0; | ||
61 | m_payload_list.clear(); | ||
62 | - if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
63 | + if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
64 | { | ||
65 | m_app14_data.header = 0xEEFF;//APP14 | ||
66 | m_app14_data.lenH = 0; | ||
67 | @@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
68 | m_pps.num_components = 3; | ||
69 | else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400) | ||
70 | m_pps.num_components = 1; | ||
71 | - else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
72 | + else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
73 | m_pps.num_components = 3; | ||
74 | else | ||
75 | MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR); | ||
76 | @@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
77 | { | ||
78 | // No external tables - use Quality parameter | ||
79 | m_dqt_list.resize(0); | ||
80 | - if (fourCC == MFX_FOURCC_RGB4) | ||
81 | + if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) | ||
82 | { | ||
83 | m_pps.quantiser_table_selector[0] = 0; | ||
84 | m_pps.quantiser_table_selector[1] = 0; | ||
85 | @@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
86 | { | ||
87 | m_dht_list.resize(0); | ||
88 | } | ||
89 | - else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4) | ||
90 | + else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)) | ||
91 | { | ||
92 | m_dht_list.resize(1); | ||
93 | |||
94 | -- | ||
95 | 2.40.1 | ||
96 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch index 762a4902..762a4902 100644 --- a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch +++ b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch | |||
diff --git a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb b/recipes-multimedia/vpl/libvpl_2.10.2.bb index 513c7f2c..167e13a5 100644 --- a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb +++ b/recipes-multimedia/vpl/libvpl_2.10.2.bb | |||
@@ -1,14 +1,14 @@ | |||
1 | SUMMARY = "oneAPI Video Processing Library" | 1 | SUMMARY = "Intel Video Processing Library" |
2 | DESCRIPTION = "The oneAPI Video Processing Library (oneVPL) provides \ | 2 | DESCRIPTION = "Intel Video Processing Library (VPL) provides \ |
3 | a single video processing API for encode, decode, and video processing \ | 3 | a single video processing API for encode, decode, and video processing \ |
4 | that works across a wide range of accelerators." | 4 | that works across a wide range of accelerators." |
5 | 5 | ||
6 | HOMEPAGE = "https://github.com/oneapi-src/oneVPL" | 6 | HOMEPAGE = "https://github.com/intel/libvpl" |
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ |
9 | file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06" | 9 | file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/intel/libvpl.git;protocol=https;branch=master \ |
12 | file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \ | 12 | file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \ |
13 | " | 13 | " |
14 | SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c" | 14 | SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c" |
@@ -21,20 +21,23 @@ PACKAGECONFIG ??= "tools" | |||
21 | PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols" | 21 | PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols" |
22 | 22 | ||
23 | do_install:append() { | 23 | do_install:append() { |
24 | mkdir -p ${D}${datadir}/oneVPL/samples | 24 | mkdir -p ${D}${datadir}/VPL/samples |
25 | mv ${D}${bindir}/sample_* ${D}${datadir}/oneVPL/samples | 25 | mv ${D}${bindir}/sample_* ${D}${datadir}/VPL/samples |
26 | } | 26 | } |
27 | 27 | ||
28 | COMPATIBLE_HOST = '(x86_64).*-linux' | 28 | COMPATIBLE_HOST = '(x86_64).*-linux' |
29 | 29 | ||
30 | PACKAGES =+ "${PN}-examples" | 30 | PACKAGES =+ "${PN}-examples" |
31 | 31 | ||
32 | RREPLACES:${PN} = "onevpl" | ||
33 | RCONFLICTS:${PN} = "onevpl" | ||
34 | |||
32 | FILES:${PN}-examples = "${datadir}/vpl \ | 35 | FILES:${PN}-examples = "${datadir}/vpl \ |
33 | " | 36 | " |
34 | 37 | ||
35 | FILES_SOLIBSDEV = "" | 38 | FILES_SOLIBSDEV = "" |
36 | FILES:${PN}-dev += "${libdir}/libvpl.so" | 39 | FILES:${PN}-dev += "${libdir}/libvpl.so" |
37 | 40 | ||
38 | FILES:${PN} += " ${datadir}/oneVPL/samples \ | 41 | FILES:${PN} += " ${datadir}/VPL/samples \ |
39 | ${libdir}/vpl/libvpl_wayland.so \ | 42 | ${libdir}/vpl/libvpl_wayland.so \ |
40 | " | 43 | " |
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb index 0b849bf1..40909a9c 100644 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb +++ b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb | |||
@@ -2,8 +2,8 @@ SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing" | |||
2 | DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \ | 2 | DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \ |
3 | video decode, encode and filtering on Intel® graphics." | 3 | video decode, encode and filtering on Intel® graphics." |
4 | 4 | ||
5 | HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu" | 5 | HOMEPAGE = "https://github.com/intel/vpl-gpu-rt" |
6 | BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues" | 6 | BUGTRACKER = "https://github.com/intel/vpl-gpu-rt/issues" |
7 | 7 | ||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b" |
@@ -14,16 +14,13 @@ PE = "1" | |||
14 | COMPATIBLE_HOST = '(x86_64).*-linux' | 14 | COMPATIBLE_HOST = '(x86_64).*-linux' |
15 | COMPATIBLE_HOST:x86-x32 = "null" | 15 | COMPATIBLE_HOST:x86-x32 = "null" |
16 | 16 | ||
17 | DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native" | 17 | DEPENDS += "libdrm libva intel-media-driver libvpl pkgconfig-native" |
18 | RDEPENDS:${PN} += "intel-media-driver" | 18 | RDEPENDS:${PN} += "intel-media-driver" |
19 | 19 | ||
20 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ | 20 | SRC_URI = "git://github.com/intel/vpl-gpu-rt.git;protocol=https;nobranch=1;lfs=0 \ |
21 | file://0001-ARLH-DID-open-source-6286.patch \ | ||
22 | file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \ | ||
23 | file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \ | ||
24 | " | 21 | " |
25 | 22 | ||
26 | SRCREV = "852fa9f705ef44c004d014548601f3804a6de705" | 23 | SRCREV = "088db9f5a8164525f00685c72f00a4baed97b90a" |
27 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
28 | 25 | ||
29 | FILES:${PN} += " \ | 26 | FILES:${PN} += " \ |
@@ -31,3 +28,6 @@ FILES:${PN} += " \ | |||
31 | " | 28 | " |
32 | 29 | ||
33 | inherit cmake | 30 | inherit cmake |
31 | |||
32 | RREPLACES:${PN} = "onevpl-intel-gpu" | ||
33 | RCONFLICTS:${PN} = "onevpl-intel-gpu" | ||
diff --git a/recipes-support/libipt/libipt_2.1.1.bb b/recipes-support/libipt/libipt_2.1.1.bb index 205967c1..c4b5ecaa 100644 --- a/recipes-support/libipt/libipt_2.1.1.bb +++ b/recipes-support/libipt/libipt_2.1.1.bb | |||
@@ -27,7 +27,7 @@ do_install:append() { | |||
27 | install -d ${D}${bindir}/libipt/tests | 27 | install -d ${D}${bindir}/libipt/tests |
28 | 28 | ||
29 | cp -r ${B}/bin/* ${D}${bindir}/libipt/ | 29 | cp -r ${B}/bin/* ${D}${bindir}/libipt/ |
30 | cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests | 30 | cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES:${PN}-test = "${bindir}" | 33 | FILES:${PN}-test = "${bindir}" |