[CP] Only Local to Staging Copy Use CPSmallLocalBar MemCopyCallbackImpl

Only Local to Staging Copy Use CPSmallLocalBar MemCopyCallbackImpl.
intel · Aug 20, 2024 · ce6e9ac · ce6e9ac
1 parent 1e2abe2
commit ce6e9ac
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.cpp
@@ -230,17 +230,11 @@ MOS_STATUS MediaCopyState_Xe_Hpm::MediaRenderCopy(PMOS_RESOURCE src, PMOS_RESOUR
 MOS_STATUS MediaCopyState_Xe_Hpm::PreCheckCpCopy(
     MCPY_STATE_PARAMS src, MCPY_STATE_PARAMS dest, MCPY_METHOD preferMethod)
 {
-    if ((preferMethod == MCPY_METHOD_POWERSAVING)
-        && (src.CpMode == MCPY_CPMODE_CP)
-        && (dest.CpMode == MCPY_CPMODE_CLEAR))
+    if (preferMethod == MCPY_METHOD_POWERSAVING &&
+        (src.CpMode == MCPY_CPMODE_CP || dest.CpMode == MCPY_CPMODE_CP))
     {
-        //Allow blt engine to do copy when dst buffer is staging buffer and allocate in system mem, since protection off with blt engine.
-        //Current only used for small localbar cases.
-        m_allowCPBltCopy = true;
-    }
-    else
-    {
-        m_allowCPBltCopy = false;
+        MCPY_ASSERTMESSAGE("BLT Copy with CP is not supported");
+        return MOS_STATUS_PLATFORM_NOT_SUPPORTED;
     }
 
     return MOS_STATUS_SUCCESS;

diff --git a/...river/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.cpp b/...river/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.cpp
@@ -71,16 +71,11 @@ MOS_STATUS MediaCopyStateXe_Xpm_Base::Initialize(  PMOS_INTERFACE  osInterface,
 MOS_STATUS MediaCopyStateXe_Xpm_Base::PreCheckCpCopy(
     MCPY_STATE_PARAMS src, MCPY_STATE_PARAMS dest, MCPY_METHOD preferMethod)
 {
-    if ((preferMethod == MCPY_METHOD_POWERSAVING)
-        && (src.CpMode == MCPY_CPMODE_CP)
-        && (dest.CpMode == MCPY_CPMODE_CLEAR))
+    if (preferMethod == MCPY_METHOD_POWERSAVING && 
+        (src.CpMode == MCPY_CPMODE_CP || dest.CpMode == MCPY_CPMODE_CP))
     {
-        //Allow blt engine to do copy when dst buffer is staging buffer and allocate in system mem, since protection off with blt engine.
-        m_allowCPBltCopy = true;
-    }
-    else
-    {
-        m_allowCPBltCopy = false;
+        MCPY_ASSERTMESSAGE("BLT Copy with CP is not supported");
+        return MOS_STATUS_PLATFORM_NOT_SUPPORTED;
     }
 
     return MOS_STATUS_SUCCESS;

diff --git a/...river/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.cpp b/...river/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.cpp
@@ -210,7 +210,8 @@ MOS_STATUS MediaCopyStateXe_Xpm_Plus::CapabilityCheck(
     // common policy check
     // legal check
     // Blt engine does not support protection, allow the copy if dst is staging buffer in system mem
-    if (mcpySrc.CpMode == MCPY_CPMODE_CP && mcpyDst.CpMode == MCPY_CPMODE_CLEAR && !m_allowCPBltCopy)
+    if (preferMethod == MCPY_METHOD_POWERSAVING && 
+        (mcpySrc.CpMode == MCPY_CPMODE_CP || mcpyDst.CpMode == MCPY_CPMODE_CP))
     {
         MCPY_ASSERTMESSAGE("illegal usage");
         return MOS_STATUS_INVALID_PARAMETER;

diff --git a/media_softlet/agnostic/common/shared/mediacopy/media_copy.cpp b/media_softlet/agnostic/common/shared/mediacopy/media_copy.cpp
@@ -139,7 +139,8 @@ MOS_STATUS MediaCopyBaseState::CapabilityCheck(
     // common policy check
     // legal check
     // Blt engine does not support protection, allow the copy if dst is staging buffer in system mem
-    if (preferMethod == MCPY_METHOD_POWERSAVING && mcpySrc.CpMode == MCPY_CPMODE_CP && mcpyDst.CpMode == MCPY_CPMODE_CLEAR && !m_allowCPBltCopy)
+    if (preferMethod == MCPY_METHOD_POWERSAVING &&
+        (mcpySrc.CpMode == MCPY_CPMODE_CP || mcpyDst.CpMode == MCPY_CPMODE_CP))
     {
         MCPY_ASSERTMESSAGE("illegal usage");
         return MOS_STATUS_INVALID_PARAMETER;
@@ -182,6 +183,13 @@ MOS_STATUS MediaCopyBaseState::CapabilityCheck(
 MOS_STATUS MediaCopyBaseState::PreCheckCpCopy(
     MCPY_STATE_PARAMS src, MCPY_STATE_PARAMS dest, MCPY_METHOD preferMethod)
 {
+    if (preferMethod == MCPY_METHOD_POWERSAVING &&
+        (src.CpMode == MCPY_CPMODE_CP || dest.CpMode == MCPY_CPMODE_CP))
+    {
+        MCPY_ASSERTMESSAGE("BLT Copy with CP is not supported");
+        return MOS_STATUS_PLATFORM_NOT_SUPPORTED;
+    }
+
     return MOS_STATUS_SUCCESS;
 }
 

diff --git a/media_softlet/agnostic/common/shared/mediacopy/media_copy.h b/media_softlet/agnostic/common/shared/mediacopy/media_copy.h
@@ -295,7 +295,6 @@ class MediaCopyBaseState
 
 public:
     PMOS_INTERFACE       m_osInterface    = nullptr;
-    bool                 m_allowCPBltCopy = false;  // allow cp call media copy only for output clear cases.
 
 protected:
     PMOS_MUTEX           m_inUseGPUMutex        = nullptr; // Mutex for in-use GPU context