Skip to content

Commit

Permalink
[CP] Remove CPCopy
Browse files Browse the repository at this point in the history
Remove CPCopy as it was WA for MTL+ Presi issue(write protected 0 on vp output surface, otherwise padding part cmp fail) that had been fixed.
  • Loading branch information
yuqian0321 authored and intel-mediadev committed Nov 13, 2023
1 parent 707eae7 commit 5a82c95
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
5 changes: 0 additions & 5 deletions media_common/agnostic/common/os/mos_os.h
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,6 @@ namespace CMRT_UMD
struct _CM_HAL_STATE;
typedef struct _CM_HAL_STATE *PCM_HAL_STATE;
class MhwCpInterface;
class CpCopyInterface;
class CodechalSecureDecodeInterface;
class CodechalSetting;
class CodechalHwInterface;
Expand Down Expand Up @@ -1958,10 +1957,6 @@ typedef struct _MOS_INTERFACE
//!
void (*pfnDeleteMhwCpInterface)(MhwCpInterface *mhwCpInterface);

CpCopyInterface* (*pfnCreateCpCopyInterface)(MOS_CONTEXT_HANDLE osDriverContext, MOS_STATUS &status);

void (*pfnDeleteCpCopyInterface)(CpCopyInterface *cpCopyInterface);

//!
//! \brief Create CodechalSecureDeocde Object
//! Must use Delete_CodechalSecureDecodeInterface to delete created Object to avoid ULT Memory Leak errors
Expand Down
10 changes: 0 additions & 10 deletions media_softlet/agnostic/common/cp/media_srcs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.

set(TMP_SOURCES_
${CMAKE_CURRENT_LIST_DIR}/cp_copy_interface.cpp
)

set(TMP_HEADERS_
${CMAKE_CURRENT_LIST_DIR}/decodecp_interface.h
${CMAKE_CURRENT_LIST_DIR}/cp_streamout_interface.h
${CMAKE_CURRENT_LIST_DIR}/cp_copy_interface.h
)

set(TMP_1_SOURCES_
Expand All @@ -35,11 +30,6 @@ set(TMP_1_HEADERS_
${CMAKE_CURRENT_LIST_DIR}/encodecp.h
)

set(CP_COMMON_NEXT_SOURCES_
${CP_COMMON_NEXT_SOURCES_}
${TMP_SOURCES_}
)

set(CP_COMMON_NEXT_HEADERS_
${CP_COMMON_NEXT_HEADERS_}
${TMP_HEADERS_}
Expand Down
7 changes: 1 addition & 6 deletions media_softlet/agnostic/common/os/mos_os.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ extern MhwCpInterface* Create_MhwCpInterface(PMOS_INTERFACE osInterface);
extern void Delete_MhwCpInterface(MhwCpInterface* mhwInterface);

#if !EMUL
extern CpCopyInterface* Create_CpCopyInterface(MOS_CONTEXT_HANDLE osDriverContext, MOS_STATUS& status);
extern void Delete_CpCopyInterface(CpCopyInterface* cpCopyInterface);

extern CodechalSecureDecodeInterface* Create_SecureDecodeInterface(CodechalSetting* codechalSettings, CodechalHwInterface* hwInterfaceInput);
extern void Delete_SecureDecodeInterface(CodechalSecureDecodeInterface* codechalSecureDecodeInterface);
#endif
Expand Down Expand Up @@ -661,10 +658,8 @@ MOS_STATUS Mos_InitOsInterface(

pOsInterface->pfnCreateMhwCpInterface = Create_MhwCpInterface;
pOsInterface->pfnDeleteMhwCpInterface = Delete_MhwCpInterface;
#if !EMUL
pOsInterface->pfnCreateCpCopyInterface = Create_CpCopyInterface;
pOsInterface->pfnDeleteCpCopyInterface = Delete_CpCopyInterface;

#if !EMUL
pOsInterface->pfnCreateSecureDecodeInterface = Create_SecureDecodeInterface;
pOsInterface->pfnDeleteSecureDecodeInterface = Delete_SecureDecodeInterface;
#endif
Expand Down

0 comments on commit 5a82c95

Please sign in to comment.