[Media Common] [VP] Fix open source kernel build error

Fix open source kernel build error #1842
intel · Aug 21, 2024 · d9e615e · d9e615e
1 parent 0f3d453
commit d9e615e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...a_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/shared/mediacopy/media_render_copy_xe2_lpm.cpp b/...a_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/shared/mediacopy/media_render_copy_xe2_lpm.cpp
@@ -42,7 +42,7 @@
 #include "media_render_common.h"
 #include "vpkrnheader.h"
 
-#ifndef _FULL_OPEN_SOURCE
+#if defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE)
 #include "igvpkrn_xe2_hpg.h"
 #endif
 
@@ -51,9 +51,12 @@ class MhwInterfacesNext;
 RenderCopyxe2_Lpm::RenderCopyxe2_Lpm(PMOS_INTERFACE  osInterface, MhwInterfacesNext *mhwInterfaces):
     RenderCopyStateNext(osInterface, mhwInterfaces)
 {
-#ifndef _FULL_OPEN_SOURCE
+#if defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE)
     m_KernelBin     = (const void*)IGVPKRN_XE2_HPG;
     m_KernelBinSize = IGVPKRN_XE2_HPG_SIZE;
+#else
+    m_KernelBin     = nullptr;
+    m_KernelBinSize = 0;
 #endif
 }
 

diff --git a/media_softlet/agnostic/Xe_R/Xe2_HPG/vp/media_srcs.cmake b/media_softlet/agnostic/Xe_R/Xe2_HPG/vp/media_srcs.cmake
@@ -18,6 +18,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-
+if(ENABLE_KERNELS AND ENABLE_NONFREE_KERNELS)
 media_include_subdirectory(kernel)
+endif()
 media_include_subdirectory(kernel_config)
diff --git a/media_softlet/media_interface/media_interfaces_lnl/media_interfaces_lnl.cpp b/media_softlet/media_interface/media_interfaces_lnl/media_interfaces_lnl.cpp
@@ -47,7 +47,7 @@
 #include "mhw_vdbox_vdenc_impl_xe_lpm_plus.h"
 #endif
 
-#ifndef _FULL_OPEN_SOURCE
+#if defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE)
 #include "igvpkrn_xe2_hpg.h"
 #include "igvpkrn_xe2_hpg_cmfcpatch.h"
 #include "igvpkrn_l0_xe2_hpg.h"
@@ -139,15 +139,14 @@ void VphalInterfacesXe2_Lpm::InitPlatformKernelBinary(
 {
     static vp::VpKernelConfigXe2_Hpg kernelConfig;
     vpPlatformInterface->SetKernelConfig(&kernelConfig);
-#ifndef _FULL_OPEN_SOURCE
+#if defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE)
     vpPlatformInterface->SetVpFCKernelBinary(
                         IGVPKRN_XE2_HPG,
                         IGVPKRN_XE2_HPG_SIZE,
                         IGVPKRN_XE2_HPG_CMFCPATCH,
                         IGVPKRN_XE2_HPG_CMFCPATCH_SIZE);
 
     vpPlatformInterface->AddVpNativeAdvKernelEntryToList(IGVP3DLUT_GENERATION_XE2_HPG, IGVP3DLUT_GENERATION_XE2_HPG_SIZE, "hdr_3dlut_l0");
-
 #endif
 }