[Media Common] Disable some Vebox feature for WCL

Disable some Vebox feature for WCL ,14018499149 - WCL - Client Mainstream/Essential/Entry (N+/N) Media Configuration (intel.com)
intel · Oct 30, 2023 · c0c328e · c0c328e
1 parent e7ba5c8
commit c0c328e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
@@ -50,13 +50,20 @@ Policy::~Policy()
     UnregisterFeatures();
 }
 
+MOS_STATUS Policy::UpdateVpHwCapsBasedOnSku(VP_HW_CAPS &vpHwCaps)
+{
+    return MOS_STATUS_SUCCESS;
+}
+
 MOS_STATUS Policy::Initialize()
 {
     VP_FUNC_CALL();
 
     VpPlatformInterface *vpPlatformInterface = (VpPlatformInterface *)m_vpInterface.GetHwInterface()->m_vpPlatformInterface;
     VP_PUBLIC_CHK_NULL_RETURN(vpPlatformInterface);
     VP_PUBLIC_CHK_STATUS_RETURN(vpPlatformInterface->InitVpHwCaps(m_hwCaps));
+    //update caps
+    UpdateVpHwCapsBasedOnSku(m_hwCaps);
     VP_PUBLIC_CHK_STATUS_RETURN(RegisterFeatures());
     m_initialized = true;
     return MOS_STATUS_SUCCESS;
@@ -943,16 +950,15 @@ MOS_STATUS Policy::GetCSCExecutionCaps(SwFilter* feature)
 
     auto userFeatureControl = m_vpInterface.GetHwInterface()->m_userFeatureControl;
     bool disableVeboxOutput = userFeatureControl->IsVeboxOutputDisabled();
-    bool disableSfc = userFeatureControl->IsSfcDisabled();
-
+    bool disableSfc         = userFeatureControl->IsSfcDisabled();
+    bool veboxTypeH         = userFeatureControl->IsVeboxTypeHMode();
     SwFilterCsc* csc = (SwFilterCsc*)feature;
 
     FeatureParamCsc *cscParams = &csc->GetSwFilterParams();
 
     MOS_FORMAT midFormat = Format_Any;
 
     VP_EngineEntry *cscEngine = &csc->GetFilterEngineCaps();
-
     // Clean usedForNextPass flag.
     if (cscEngine->usedForNextPass)
     {
@@ -1003,10 +1009,18 @@ MOS_STATUS Policy::GetCSCExecutionCaps(SwFilter* feature)
         {
             VP_PUBLIC_NORMALMESSAGE("BeCsc is needed by Alpha when output from vebox. Keep csc filter.");
             cscEngine->bEnabled             = 1;
-            cscEngine->SfcNeeded            = disableSfc ? 0 : 1;
-            cscEngine->VeboxNeeded          = 1;
+            cscEngine->SfcNeeded            = disableSfc ? 0 : 1; 
             cscEngine->RenderNeeded         = 1;
-            cscEngine->fcSupported          = 1;
+            cscEngine->fcSupported          = 1;         
+            if (veboxTypeH)
+            {
+                cscEngine->VeboxNeeded = 0;
+                VP_PUBLIC_NORMALMESSAGE("Not use vebox to do csc for veboxTypeH.");
+            }
+            else
+            {
+                cscEngine->VeboxNeeded = 1;
+            }
         }
         else
         {

diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.h b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.h
@@ -72,6 +72,8 @@ class Policy
     {
         return m_featurePool;
     }
+
+    virtual MOS_STATUS UpdateVpHwCapsBasedOnSku(VP_HW_CAPS &vpHwCaps);
 
 protected:
     virtual MOS_STATUS RegisterFeatures();

diff --git a/media_softlet/agnostic/common/vp/hal/utils/vp_user_feature_control.cpp b/media_softlet/agnostic/common/vp/hal/utils/vp_user_feature_control.cpp
@@ -284,6 +284,13 @@ VpUserFeatureControl::VpUserFeatureControl(MOS_INTERFACE &osInterface, VpPlatfor
         m_ctrlValDefault.splitFramePortions = splitFramePortions;
     }
 
+    //check vebox type 
+    if (skuTable && (MEDIA_IS_SKU(skuTable, FtrVeboxTypeH)))
+    {
+        m_ctrlValDefault.veboxTypeH = true;
+    }
+    VP_PUBLIC_NORMALMESSAGE("veboxTypeH %d", m_ctrlValDefault.veboxTypeH);
+
     m_ctrlVal = m_ctrlValDefault;
 }
 

diff --git a/media_softlet/agnostic/common/vp/hal/utils/vp_user_feature_control.h b/media_softlet/agnostic/common/vp/hal/utils/vp_user_feature_control.h
@@ -51,6 +51,7 @@ class VpUserFeatureControl
         bool disableDn                      = false;
         bool cscCosffPatchModeDisabled      = false;
         bool ForceEnableVeboxOutputSurf     = false;
+        bool veboxTypeH                     = false;
 
 #if (_DEBUG || _RELEASE_INTERNAL)
         bool forceDecompressedOutput        = false;
@@ -165,6 +166,11 @@ class VpUserFeatureControl
         return m_ctrlVal.decompForInterlacedSurfWaEnabled;
     }
 
+    bool IsVeboxTypeHMode()
+    {
+        return m_ctrlVal.veboxTypeH;
+    }
+
     MOS_STATUS SetClearVideoViewMode(bool mode)
     {
         m_ctrlVal.clearVideoViewMode = mode;