summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-14Bump version to 1.4.2.pre1v1.4-branchXiang, Haihao1-2/+2
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2014-11-11Add one hook list to disable encoding on some Ivybridge machinesZhao Yakui1-0/+64
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Daniel Charles <daniel.charles@intel.com> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Ram Mohan Satyanarayana <ram.mohanx.satyanarayana@intel.com> (cherry picked from commit 71a431b04ea04b93ba8f32e95fa545b30726bf59)
2014-11-11Add one hook list to disable encoding on some Sandybridge machinesZhao Yakui1-0/+64
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Daniel Charles <daniel.charles@intel.com> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Ram Mohan Satyanarayana <ram.mohanx.satyanarayana@intel.com> (cherry picked from commit 080784f57f48c517d7a672b23b6d07278b232660)
2014-10-30Call preinit_hw_codec callback after successful initialization to avoid ↵Zhao Yakui1-3/+3
segment fault issue on unsupported platform Reported-by: Nicholas Andrade <sdnick484@yahoo.com> Tested-by: Nicholas Andrade <sdnick484@yahoo.com> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 12d1be8fee694f60698e2ce277afff89d029f836)
2014-10-24Intel driver 1.4.1Xiang, Haihao2-3/+3
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2014-10-10Update NEWS & version for 1.4.1 pre1Xiang, Haihao2-3/+6
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2014-10-10build: fix make dist for packaging.Gwenole Beauchesne2-0/+4
If the intel-gen4asm tool is not available, ship with the pre-built EU kernels instead of trying to regenerate them. In particular, just don't expose the build rules if intel-gen4asm is not installed. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 238d8077705711036d62a6d536311def3ef35035)
2014-10-08Encoding: Add one hook callback function to detect encoding capabilitiy on ↵Zhao Yakui1-0/+111
Haswell Some Haswell machine doesn't support the encoding. So it should be disabled. Otherwise the driver can't report the supported capability correctly. V2->V3:Based on the Matt Turner's suggestion the __cpuid defined in GCC cpuid.h is called directly, which is helpful to handle the PIC issue on 32-bit. And unsigned data type is updated to uint32_t. V1->V2: Minor update based on comment from Gwenole Beauchesne. For example: use the bool tye and remove the hardcoded value Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-10-08change the attribute of hw_codec_info so that it can be updated dynamicallyZhao Yakui3-10/+10
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-10-08Add one callback function for hw_codec_info to initialize hw_codec_infoZhao Yakui2-0/+4
V1->V2: Refine the call back function name from hw_codec_hook to preinit_hw_codec And it is called after VADriverContext is fully initialized. This is based on the comment from Gwenole Beauchesne. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-09-30Intel driver 1.4.0Xiang, Haihao2-4/+5
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2014-09-25Driver 1.4.0.pre2Zhao, Yakui1-1/+1
2014-09-25CHV: Add PCIID placeholders for CHVSean V Kelley3-0/+57
Pending branding and differentiation by stepping. CHV is used generically to match libdrm and mesa identification. Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>
2014-09-09Init driver 1.4.0.pre1Zhao Yakui1-3/+3
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-09-09Update NEWS for 1.4.0Zhao Yakui1-1/+13
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-09-09initial export_refcount for obj_bufferZhao, Halley1-0/+1
(cherry picked from commit 11d01d01ce7ceedf19c74bdd8a07961b0fd8dd9b)
2014-09-09Add support for new VA buffer export APIs.Gwenole Beauchesne2-0/+133
Implement va{Acquire,Release}BufferHandle() hooks so that to allow VA surface or VA image buffer sharing with thirdparty APIs like EGL, OpenCL, etc. v2: made sure to sync bo before export, improved VA buffer type check. v3: tracked internal resources on acquire, disposed them on release. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 483bb130925182f2096cd9e6fa5dbae6a55e7764)
2014-09-09Remove gen7 only limitation for encoding configurationZhong Li2-7/+5
Since all generations from gen6 can support avc encoding configuration, remove gen7 only limitation. MVC also can be support with little change, but it is low priority, it will be support when necessary and this function is stable. Signed-off-by: Zhong Li <zhong.li@intel.com> (cherry picked from commit f2178e267a67bdecab0a30502804c2ce5bccd0c2)
2014-09-09Enabling BDW avc encoding configurationZhong Li4-24/+95
Signed-off-by: Zhong Li <zhong.li@intel.com> (cherry picked from commit 739eb9c0c954eecaf17a24be336ca5054241a338)
2014-09-09Enabling HSW avc encoding configurationZhong Li4-54/+97
Signed-off-by: Zhong Li <zhong.li@intel.com> (cherry picked from commit 1239853edc9c344a823d788c6df57da82eda25bf)
2014-09-09Enabling SNB avc encoding configurationZhong Li5-18/+79
Signed-off-by: Zhong Li <zhong.li@intel.com> (cherry picked from commit 3e531e7d640ef329151b2205c2e61a67fb80862d)
2014-09-09Add multi quality levels encoding support for GEN7Zhong Li8-17/+109
Two encoding quality levels are support on GEN7. Default quality level is set to be 1, which has better quality, but higher gpu usage. The second quality level is set to be 2, which has worse quality but it has lower gpu usage. Other platforms support for multi-quality-level will be added later. v1->v2: 1. follow haihao's comments to init and check quality_level. 2. remove CBR limitation for low quality level. (Zhao Yakui helps to merge several patches on staging so that it can be cherry-picked to master) Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
2014-09-05Add phantom slice support on IVB+Zhong Li3-0/+36
HW requires driver to add a phantom slice when FirstMbX and FirstMbY are not 0, in order to avc decoding error concealment. Otherwise, GPU may hang. This patch is a workround for bug: https://bugs.freedesktop.org/show_bug.cgi?id=81447 v1->v2: Follow haihao's suggestion to use common funcion of gen6 phantom slice. v2->v3: Remove an extraneous newline. Signed-off-by: Zhong Li <zhong.li@intel.com> Reviewed-by: Xiang Haihao <haihao.xiang@intel.com> Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 9672c5ab17c32f25ce1bbdb883abda689440b116)
2014-09-05Move gen6 phantom slice function as commonZhong Li3-79/+84
Following haihao's suggestion, make gen6 phantom slice funcion can be re-used by SNB+. v1->v2: Remove an unnessary comment. Signed-off-by: Zhong Li <zhong.li@intel.com> Reviewed-by: Xiang Haihao <haihao.xiang@intel.com> Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 5e30cc3093407ca2b4dbefa1da8a1262ff8ae7e9)
2014-09-02H264_Encoding: Fix the incorrect Qp setting under CBR when slice_header is ↵Zhao Yakui3-13/+37
passed Fix the issue in https://bugs.freedesktop.org/show_bug.cgi?id=83143 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Tested-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com> (cherry picked from commit eca8e0065e3a04156e0817d3a5ac14f4df39d603) Conflicts: src/gen6_mfc.c src/gen8_mfc.c
2014-08-18decoder: h264: fix RefPicList0/1 without frame in DPB.Gwenole Beauchesne1-0/+4
Some bitstreams (e.g. truncated, or non conformant), or bugs in codec layers, would incorrectly make decoders to fill in the RefPicList0/1 lists with surfaces that have not received any content yet. There is no reason for the driver to crash in such cases. https://bugs.freedesktop.org/show_bug.cgi?id=82466 Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2014-07-23Add more check of H264 slice param to avoid GPU hang caused by the incorrect ↵Zhao Yakui1-0/+33
parameter This is to fix the GPU hang in https://bugs.freedesktop.org/show_bug.cgi?id=76363 V1->V2: Use the new check based on Haihao's comment. Discard the current frame with the error slice_param instead of smart fix. In such case it can prompt that the error slice_param can be fixed by the upper-middle. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Tested-by: ValdikSS <iam@valdikss.org.ru> Reviewed-by: Xiang Haihao <haihao.xiang@intel.com> (cherry picked from commit 04202281135149a13a32dfb8a902debfac1331fe)
2014-07-01remove fixed uses of inte-gen4asm toolZhao, Yakui2-3/+3
In the gen7 and gen8 post processing Makefiles the GEN4ASM variable is not honored when calling intel-gen4asm. This causes build errors when GEN4ASM is set to a different value This was discovered when using intel-gpu-tools version 1.7 where the shaders are actually compiled. Signed-off-by: Daniel Charles <daniel.charles@intel.com> Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit f574f2e8a8da27b96abc3936c5b2372ff2b7eefb)
2014-06-16Encoding: Use the different delimeter to pass packed_rawdata and ↵Zhao, Yakui2-25/+104
slice_header based on VAConfigAttribEncPackedHeaders attribute Currently the packed_slice_header is optional. And it uses the VAEncSliceParameterBuffer as the delimeter to decide how to insert the packed rawdata/slice_header for one slice. This is not convenient under some scenario. For example: some user hope to be more flexible. When the user is responsible for generating the packed slice_header, it hopes to use the packed slice_header as the delimeter to determine how to inser the packed rawdata/slice_header for the given slice. So the VAConfigAttribEncPackedHeaders attriburation of encoding_context is used to decide which kind of delimeter. a. When the VAEncPackedSlice is set when calling vaCreateConfig, it will use the packed slice_header as delimeter. Of course the packed rawdata should be parsed before the packed slice_header for one given slice. For exmaple: for the slice 0: the packed rawdata should be parsed before paring the first packed slice_header. After one packed slice_header is parsed, it will start to parse the corresponding data for a new slice. b. When the VAEncPackedSlice is not set when calling vaCreateConfig, it will use the VAEncSliceParameterBuffer as delimeter. V1->V2: Return an error instead of only complaining warning message when packed slice_header is missing for some slice under the VAEncPackedSlice mode. This is the suggestion from Gwenole and Sreerenj Balachandran. Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit 9d49a6d693aa6c862467a4a879bc86d9cb98dbe5)
2014-06-16Encoding: Update the comment for the data structure about the packed ↵Zhao, Yakui1-2/+6
rawdata/slice_header data Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 56715c893fa87e2d3af2938b9202d75cdc79a8fd)
2014-06-16Fix the segfault while encoding multiple slice per frame.Sreerenj Balachandran1-0/+7
Zero initialize the packed raw data index array and packed slice header index array during each preallocation. Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com> Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit fbbe401aa28a0b3859d587ef08f0df15a2f7c8f2)
2014-06-16Fix the segfault while inserting packed slice headerSreerenj Balachandran1-2/+2
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com> Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit 7c2273f1334d7d45e248d128e17200b7e8beffd1)
2014-06-16Fix the GetConfigAttributes() for H264SteroHighProfileSreerenj Balachandran1-0/+1
(cherry picked from commit 510b271f912afb35edac1d3fb39354ee98b01711)
2014-06-16H264_encoding: Don't update the slice qp for CBR mode when finding packed ↵Zhao, Yakui3-6/+12
slice_header data Otherwise the slice qp is inconsistent and the encoding is incorrect. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 897527c30435202927e6cd05cd5189a710d02c91)
2014-06-16H264_Encoding: Add the support of packed slice header to be flexibleZhao, Yakui6-94/+90
Under some encoding scenario, the user hopes to generate the packed slice header data by themself and then the driver can insert the passed slice header packed data into the coded clip. 1.The VA_ENC_PACKED_HEADER_SLICE flag is exported and it is treated as optional. This is to say: if packed slice header data is passed, it will be inserted directly. If no packed slice header data is passed, the driver will help to generate it. 2.Another restriction is that the packed slice header data is inserted after the packed rawdata for one slice. That is to say: If it needs to insert the packed rawdata and slice header data, the packed rawdata will be inserted firstly(This is handled by the driver). Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit 00111e8a8bfa67b971419b72577eaa1b9f47bc34) Conflicts: src/gen75_mfc.c src/gen8_mfc.c
2014-06-16H264_encoding: Reset the last_packed_header_type to avoid the unpaired ↵Zhao, Yakui1-1/+6
packed header type/data After adding the support of inserting the packed rawdata, more group of packed header data can be passed. In order to insert the packed rawdata correctly, the packed header type/ data should be paired. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit fd78866bd64d7ab57fe8cb0c4b25e8357973b0b1)
2014-06-16H264_encoding: Add the support of inserting the packed raw data passed from userZhao, Yakui6-11/+121
Under some encoding scenario, the user-space application hopes that the driver can insert the passed packed rawdata into the coded clip. This is to allow the insertion of packed rawdata passed from user. As the position of packed rawdata is related with the slice. So the following restrictions are added: 1. the packed rawdata header type/data should be paired. 2. the packed rawdata data is inserted by following the passed order 3. the packed rawdata header type/data is split by using VAEncSliceParameterBuffer. That is to say: The packed rawdata for slice 0 should be passed before the first VAEncSliceParameterBuffer. After one VAEncSliceParameterBuffer is parsed, the subseuquent packed rawdata is for another new slice. The subsequent packed rawdata after the last VAEncSliceParameterBuffer is ignored. 4. it does not change the rule for the packed data of SPS/PPS/MISC type. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 974597ef64dc9a283d4787e1484a75d1610414f4) Conflicts: src/gen75_mfc.c src/gen8_mfc.c
2014-06-16H264_Encoding: Prepare some data structures for adding packed raw dataZhao, Yakui2-0/+63
Under some encoding scenario, the user-space application hopes that the driver can insert the passed packed rawdata into the coded clip. But the insertion of packed rawdata is related with the slice. So some data structures are added so that it can store how the packed rawdata is inserted into the coded clip per-slice. Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com> (cherry picked from commit 65727b1868f01d836659396724b83d2992656242)
2014-06-16H264_Encoding: Parse the packed header data from user to fix the hacked code ↵Zhao, Yakui1-3/+60
of HW skip bytes When the packed header data from user is inserted into the coded clip, it uses the hacked code to check the number of HW skip emulation bytes. This is wrong. So fix it. Of course if the packed header data is generated by the driver, it is unnecessary to check it and it can still use the pre-defined number of HW skip bytes. V1->V2: Based on Gwenole's comment more nal_unit_type is added. Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit cd518563f239cb8523c58010a695098465a4f04e)
2014-06-16Encoding: Reinitialize CBR bit rate-control parameter to support switch of ↵Zhao, Yakui2-2/+56
bitrate under CBR Tested-By: Sean V Kelley <sean.v.kelley@intel.com> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 929c1446a28dbefd9655774f2db3e10f7b631dcf)
2014-06-16decoder: h264: fix frame store logic for MVC.Gwenole Beauchesne12-45/+111
In strict MVC decoding mode, when only the necessary set of inter-view reference pictures are passed to the ReferenceFrames array for decoding the current picture, we should not re-use a frame store id that might be needed for decoding another view component in the same access unit. One way to solve this problem is to track when the VA surface in a specified frame store id was last referenced. So, a "ref_age" field is introduced to the GenFrameStore struct and is updated whenever the surface is being referenced. Additionally, the list of retired refs candidates (free_refs) is kept ordered by increasing ref_age. That way, we can immediately know what is the oldest frame store id to recycle. Let deltaAge = CurrAge - RefAge: If deltaAge > 1, we know for sure that the VA surface is gone ; If deltaAge = 1, the surface could be re-used for inter prediction ; If deltaAge = 0, the surface could be re-used for inter-view prediction. The ref_age in each Frame Store entry is always current, i.e. it is the same for all reference frames that intervened in the decoding process of all inter view components of the previous access unit. The age tracks access units. v2: used a more correct representation of age, instead of POC [Yakui] v3: minor optimization for detecting changes of access unit [Haihao] Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 3b5eb0522fbfe1220dcd0c0bb093a93cfc25e22c)
2014-06-16decoder: h264: improve AVC_REF_IDX_STATE for MVC.Gwenole Beauchesne1-1/+17
Each Reference List Entry has Bit 6 set to one if the reference picture is to be used as a long-term reference picture. However, the H.264 standard, and subsequently the VA-API specs, makes it possible to mark the picture as "used for short-term reference", as "used for long-term reference", or even none of those flags. This means we have to handle a minimum of 3 states. This doesn't fit the range of a single bit. Let's examine how this could be fixed from known practices. There are cases where the picture is added to RefPicListX[] even if it is not marked as "used for short-term reference" or "used for long-term reference": MVC with inter-view reference components or inter-view only reference components [H.8.4]. Ultimately, this has an incidence on the value of colZeroFlag (8.4.1.2.2). Since there is no way to program that, and that it depends on the picture to be marked as "used for short-term reference" or not, then it looks reasonable to imply Bit 6 (LongTermPicFlag) as a picture that is *not* "used for short-term reference", i.e. thus including genuine long-term reference pictures, and those that are neither long-term reference nor short-term reference pictures. In practice, this fixes MVCNV-2.264. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit edbdc0e87919d8b7261d882a32b2d3c271660931)
2014-06-16surface: drop SURFACE_DISPLAYED flag.Gwenole Beauchesne7-15/+20
The optimization by which the VA surface storage is deallocated after it is displayed and not used for reference or vaDeriveImage() purposes cannot be implemented safely. We need to honour explicit lifetimes defined by the upper codec layer. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 84926ace7a2c5b88df1ada167a1c273128469aad)
2014-06-16render: don't deallocate surface storage of displayed frames.Gwenole Beauchesne1-5/+0
Keep the VA surface storage live until it is explicitly scheduled for destruction through vaDestroySurfaces() interface. Otherwise, subsequent vaPutSurface() calls would have no effect. This fixes various use cases like: display of interlaced frames that are not marked for reference, multiple rendering to Pixmap for EXT_texture_from_pixmap and more precisely interlaced streams. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit a840e6403071d397a33e127e8058881a3ef50077)
2014-06-16decoder: MVC chroma formatsGwenole Beauchesne1-0/+6
This is a part of fa469f74227a7b4e0e6f882c488132eaa9c44417 on staging Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
2014-06-16decoder: h264: expose the set of supported MVC profiles.Gwenole Beauchesne9-17/+54
H.264 MVC decoding support is defined as follows: - Stereo High profile on Sandybridge and newer ; - Multiview High profile on Haswell and newer. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 1f244834dedb7b46863b315a898d8649d01c5f58) Conflicts: src/i965_device_info.c src/i965_drv_video.c src/va_backend_compat.h
2014-06-16decoder: h264: enable Picture ID Remapping on Haswell and newer.Gwenole Beauchesne4-36/+136
Fill and submit MFX_AVC_PICID_STATE commands to Gen7.5+ hardware. This optimizes the management of the DPB as the binding array can now contain entries in any order. This also makes it possible to support H.264 MultiView High profiles, with any particular number of views. v2: added more comments for clarity, removed an assert [Yakui] Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 8dfdf10612c726b60ecd5b61eee2b7d6a520bb33)
2014-06-16decoder: h264: factor out look ups for VA/H264 picture info.Gwenole Beauchesne8-151/+77
Add new avc_find_picture() helper function to search for a VAPictureH264 struct based on the supplied VA surface id. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 3f4f9fc2893af24b7e88f44b6350a5a74d49f0c2)
2014-06-16decoder: h264: fix submission of AVC_REF_IDX_STATE command.Gwenole Beauchesne1-17/+18
If the RefPicListX[] entry has no valid picture_id associated to it, then set the resulting state to 0xff. If that entry has no surface buffer storage either, then compose a valid state that maps to the first item in the reference frames list, as mandated by the PRM. v2: dropped the superfluous "found" variable [Yakui] Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 151b8851c3a9309e87712651a3697e20a7bdb6c9)
2014-06-16decoder: h264: simplify and optimize reference frame store updates.Gwenole Beauchesne1-64/+44
Simplify and optimize the update process of the reference frame store. Use less iterations to look up existing objects. Use a cache to store the free'd slots. Prerequisite: the reference_objects[] array was previously arranged in a way that the element at index i is exactly the object_surface that corresponds to the VA surface identified by the VAPictureH264.picture_id located at index i in the ReferenceFrames[] array. Theory of operations: 1. Obsolete entries are removed first, i.e. entries in the internal DPB that no longer have a match in the supplied ReferenceFrames[] array. That obsolete entry index is stored in a local cache: free_slots[]. 2. This cache is completed with entries considered as "invalid" or "not present", sequentially while traversing the frame store for obsolete entries. At the end of this removal process, the free_slots[] array represents all possible indices in there that could be re-used for new reference frames to track. 3. The list of ReferenceFrames[] objects is traversed for new entries that are not already in the frame store. If an entry needs to be added, it is placed at the index obtained from the next free_slots[] element. There is no need to traverse the frame store array again, the next available slot can be known from that free_slots[] cache. v2: dropped the superfluous "found" variable [Yakui] v3: renamed "free_slots" array to "free_refs", which now holds GenFrameStore entries Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> (cherry picked from commit 70ecad1264255123df99b472891e8ee90399013c)