From b98aa43b8b5d57ace050d4ce4b17624b32ceef8a Mon Sep 17 00:00:00 2001 From: luleilei1 Date: Tue, 12 Dec 2023 17:33:03 +0800 Subject: [PATCH] Revert "[Decode] SW WA for Check HuC authentication status in ACM D3 cold state" This reverts commit intel-innersource/drivers.gpu.unified#b4440bd6b --- media_common/agnostic/common/hw/mhw_mmio.h | 1 - .../agnostic/gen12/hw/mhw_mi_g12_X.cpp | 38 ----- media_driver/agnostic/gen12/hw/mhw_mi_g12_X.h | 5 - media_driver/agnostic/gen12/hw/mhw_mmio_g12.h | 3 +- .../gen12/hw/vdbox/mhw_vdbox_huc_g12_X.cpp | 1 - .../decode_huc_authcheck_packet_m12.cpp | 153 ------------------ .../packet/decode_huc_authcheck_packet_m12.h | 97 ----------- .../hevc/packet/decode_huc_s2l_packet_m12.cpp | 21 +-- .../hevc/packet/decode_huc_s2l_packet_m12.h | 15 +- .../hal/dec/hevc/packet/media_srcs.cmake | 4 +- .../pipeline/decode_hevc_pipeline_m12.cpp | 26 --- .../hevc/pipeline/decode_hevc_pipeline_m12.h | 7 - .../dec/hevc/pipeline/decode_hevc_pipeline.h | 2 +- 13 files changed, 5 insertions(+), 368 deletions(-) delete mode 100644 media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.cpp delete mode 100644 media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.h diff --git a/media_common/agnostic/common/hw/mhw_mmio.h b/media_common/agnostic/common/hw/mhw_mmio.h index 9e7dc6f5b41..a0cfda5f196 100644 --- a/media_common/agnostic/common/hw/mhw_mmio.h +++ b/media_common/agnostic/common/hw/mhw_mmio.h @@ -99,7 +99,6 @@ struct MmioRegistersHuc uint32_t hucStatusRegOffset = 0; uint32_t hucUKernelHdrInfoRegOffset = 0; uint32_t hucStatus2RegOffset = 0; - uint32_t hucLoadInfoOffset = 0; }; //! diff --git a/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.cpp b/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.cpp index 1ef3552b9c1..006bcc7644d 100644 --- a/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.cpp +++ b/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.cpp @@ -235,44 +235,6 @@ MOS_STATUS MhwMiInterfaceG12::AddMiBatchBufferStartCmd( return MOS_STATUS_SUCCESS; } -MOS_STATUS MhwMiInterfaceG12::AddMiBatchBufferStartCmd( - PMOS_COMMAND_BUFFER cmdBuffer, - PMHW_BATCH_BUFFER batchBuffer, - bool useChainedBB) -{ - MHW_FUNCTION_ENTER; - - MHW_MI_CHK_NULL(cmdBuffer); - MHW_MI_CHK_NULL(batchBuffer); - MHW_MI_CHK_NULL(m_osInterface); - bool vcsEngineUsed = - MOS_VCS_ENGINE_USED(m_osInterface->pfnGetGpuContext(m_osInterface)); - - mhw_mi_g12_X::MI_BATCH_BUFFER_START_CMD cmd; - MHW_RESOURCE_PARAMS resourceParams; - MOS_ZeroMemory(&resourceParams, sizeof(resourceParams)); - resourceParams.presResource = &batchBuffer->OsResource; - resourceParams.dwOffset = batchBuffer->dwOffset; - resourceParams.pdwCmd = cmd.DW1_2.Value; - resourceParams.dwLocationInCmd = 1; - resourceParams.dwLsbNum = MHW_COMMON_MI_GENERAL_SHIFT; - resourceParams.HwCommandType = vcsEngineUsed ? MOS_MI_BATCH_BUFFER_START : MOS_MI_BATCH_BUFFER_START_RCS; - - MHW_MI_CHK_STATUS(AddResourceToCmd( - m_osInterface, - cmdBuffer, - &resourceParams)); - - // Set BB start - cmd.DW0.Obj3.SecondLevelBatchBuffer = useChainedBB ? false : true; - cmd.DW0.Obj0.AddressSpaceIndicator = !IsGlobalGttInUse(); - - // Send BB start command - MHW_MI_CHK_STATUS(m_osInterface->pfnAddCommand(cmdBuffer, &cmd, cmd.byteSize)); - - return MOS_STATUS_SUCCESS; -} - MOS_STATUS MhwMiInterfaceG12::AddMiConditionalBatchBufferEndCmd( PMOS_COMMAND_BUFFER cmdBuffer, PMHW_MI_CONDITIONAL_BATCH_BUFFER_END_PARAMS params) diff --git a/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.h index c7542880f15..1690a448f5c 100644 --- a/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.h +++ b/media_driver/agnostic/gen12/hw/mhw_mi_g12_X.h @@ -70,11 +70,6 @@ struct MhwMiInterfaceG12 : public MhwMiInterfaceGeneric PMOS_COMMAND_BUFFER cmdBuffer, PMHW_BATCH_BUFFER batchBuffer) override; - MOS_STATUS AddMiBatchBufferStartCmd( - PMOS_COMMAND_BUFFER cmdBuffer, - PMHW_BATCH_BUFFER batchBuffer, - bool useChainedBB = false); - MOS_STATUS AddMiStoreRegisterMemCmd( PMOS_COMMAND_BUFFER cmdBuffer, PMHW_MI_STORE_REGISTER_MEM_PARAMS params) override; diff --git a/media_driver/agnostic/gen12/hw/mhw_mmio_g12.h b/media_driver/agnostic/gen12/hw/mhw_mmio_g12.h index 8bd6879f8a1..9083556921a 100644 --- a/media_driver/agnostic/gen12/hw/mhw_mmio_g12.h +++ b/media_driver/agnostic/gen12/hw/mhw_mmio_g12.h @@ -90,8 +90,7 @@ #define HUC_UKERNEL_HDR_INFO_REG_OFFSET_NODE_1_INIT_G12 0x1C2014 #define HUC_STATUS_REG_OFFSET_NODE_1_INIT_G12 0x1C2000 #define HUC_STATUS2_REG_OFFSET_NODE_1_INIT_G12 0x1C23B0 -#define HUC_LOAD_INFO_REG_OFFSET_G12 0xC1DC -#define HUC_LOAD_INFO_REG_MASK_G12 0x1 + //VDBOX MFX register offsets #define GENERAL_PURPOSE_REGISTER0_LO_OFFSET_NODE_1_INIT_G12 0x1C0600 diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_g12_X.cpp b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_g12_X.cpp index 01f8c26f003..3f160564510 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_g12_X.cpp +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_g12_X.cpp @@ -35,7 +35,6 @@ void MhwVdboxHucInterfaceG12::InitMmioRegisters() mmioRegisters->hucUKernelHdrInfoRegOffset = HUC_UKERNEL_HDR_INFO_REG_OFFSET_NODE_1_INIT_G12; mmioRegisters->hucStatusRegOffset = HUC_STATUS_REG_OFFSET_NODE_1_INIT_G12; mmioRegisters->hucStatus2RegOffset = HUC_STATUS2_REG_OFFSET_NODE_1_INIT_G12; - mmioRegisters->hucLoadInfoOffset = HUC_LOAD_INFO_REG_OFFSET_G12; m_mmioRegisters[MHW_VDBOX_NODE_2] = m_mmioRegisters[MHW_VDBOX_NODE_1]; } diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.cpp deleted file mode 100644 index 389e55ee052..00000000000 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* -* Copyright (c) 2023, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ -//! -//! \file decode_huc_authcheck_packet_m12.cpp -//! \brief Defines the interface for HuC authentication check packet -//! - -#include "decode_huc_authcheck_packet_m12.h" -#include "decode_resource_auto_lock.h" -#include "mhw_mmio_g12.h" -#include "mhw_mi_g12_X.h" - -namespace decode -{ - MOS_STATUS DecodeHucAuthCheckPktM12::Init() - { - DECODE_FUNC_CALL(); - - DECODE_CHK_NULL(m_miInterface); - DECODE_CHK_NULL(m_osInterface); - DECODE_CHK_NULL(m_pipeline); - - m_allocator = m_pipeline->GetDecodeAllocator(); - DECODE_CHK_NULL(m_allocator); - - if (m_hucAuthCheckBuf == nullptr) - { - // Init buffer for storing Huc auth status MMIO - m_hucAuthCheckBuf = m_allocator->AllocateBuffer( - sizeof(uint64_t), "Huc authentication register store Buffer", - resourceInternalReadWriteCache, lockableVideoMem, true, 0); - DECODE_CHK_NULL(m_hucAuthCheckBuf); - - // add MMIO mask in DW0 - MOS_LOCK_PARAMS lockFlags; - MOS_ZeroMemory(&lockFlags, sizeof(MOS_LOCK_PARAMS)); - lockFlags.WriteOnly = 1; - uint32_t *hucRegData = (uint32_t *)m_osInterface->pfnLockResource(m_osInterface, &m_hucAuthCheckBuf->OsResource, &lockFlags); - DECODE_CHK_NULL(hucRegData); - *hucRegData = HUC_LOAD_INFO_REG_MASK_G12; - m_osInterface->pfnUnlockResource(m_osInterface, &m_hucAuthCheckBuf->OsResource); - } - - if (m_secondLevelBBArray == nullptr) - { - // 1 CL enough for huc auth check - m_secondLevelBBArray = m_allocator->AllocateBatchBufferArray( - CODECHAL_CACHELINE_SIZE, 1, CODECHAL_HEVC_NUM_DMEM_BUFFERS, true, lockableVideoMem); - DECODE_CHK_NULL(m_secondLevelBBArray); - } - - return MOS_STATUS_SUCCESS; - } - - MOS_STATUS DecodeHucAuthCheckPktM12::Destroy() - { - DECODE_FUNC_CALL(); - - DECODE_CHK_NULL(m_allocator); - DECODE_CHK_STATUS(m_allocator->Destroy(m_hucAuthCheckBuf)); - DECODE_CHK_STATUS(m_allocator->Destroy(m_secondLevelBBArray)); - - return MOS_STATUS_SUCCESS; - } - - MOS_STATUS DecodeHucAuthCheckPktM12::Execute(MOS_COMMAND_BUFFER &cmdBuffer) - { - DECODE_FUNC_CALL(); - - // add media reset check 100ms, which equals to 1080p WDT threshold - DECODE_CHK_STATUS(m_miInterface->SetWatchdogTimerThreshold(1920, 1080, true)); - DECODE_CHK_STATUS(m_miInterface->AddWatchdogTimerStopCmd(&cmdBuffer)); - DECODE_CHK_STATUS(m_miInterface->AddWatchdogTimerStartCmd(&cmdBuffer)); - - // program 2nd level chained BB for Huc auth - m_batchBuf = m_secondLevelBBArray->Fetch(); - if (m_batchBuf != nullptr) - { - ResourceAutoLock resLock(m_allocator, &m_batchBuf->OsResource); - uint8_t *batchBufBase = (uint8_t *)resLock.LockResourceForWrite(); - DECODE_CHK_NULL(batchBufBase); - DECODE_CHK_STATUS(Init2ndLevelCmdBuffer(*m_batchBuf, batchBufBase)); - m_hucAuthCmdBuffer.cmdBuf1stLvl = &cmdBuffer; - PackHucAuthCmds(m_hucAuthCmdBuffer); - DECODE_CHK_STATUS(m_miInterface->AddMiBatchBufferEnd(&m_hucAuthCmdBuffer, nullptr)); - } - - // BB start for 2nd level BB - DECODE_CHK_STATUS(m_miInterface->AddMiBatchBufferStartCmd(&cmdBuffer, m_batchBuf)); - - return MOS_STATUS_SUCCESS; - } - - MOS_STATUS DecodeHucAuthCheckPktM12::Init2ndLevelCmdBuffer(MHW_BATCH_BUFFER &batchBuffer, uint8_t *batchBufBase) - { - DECODE_FUNC_CALL(); - - auto &cmdBuffer = m_hucAuthCmdBuffer; - MOS_ZeroMemory(&cmdBuffer, sizeof(MOS_COMMAND_BUFFER)); - cmdBuffer.pCmdBase = (uint32_t *)batchBufBase; - cmdBuffer.pCmdPtr = cmdBuffer.pCmdBase; - cmdBuffer.iRemaining = batchBuffer.iSize; - cmdBuffer.OsResource = batchBuffer.OsResource; - - return MOS_STATUS_SUCCESS; - } - - MOS_STATUS DecodeHucAuthCheckPktM12::PackHucAuthCmds(MOS_COMMAND_BUFFER &cmdBuffer) - { - DECODE_FUNC_CALL(); - - // Store Huc Auth register - MHW_MI_STORE_REGISTER_MEM_PARAMS storeRegParams; - MOS_ZeroMemory(&storeRegParams, sizeof(storeRegParams)); - storeRegParams.presStoreBuffer = &m_hucAuthCheckBuf->OsResource; - storeRegParams.dwOffset = sizeof(uint32_t); - storeRegParams.dwRegister = m_hucInterface->GetMmioRegisters(MHW_VDBOX_NODE_1)->hucLoadInfoOffset; - DECODE_CHK_STATUS(m_miInterface->AddMiStoreRegisterMemCmd(&cmdBuffer, &storeRegParams)); - - MHW_MI_FLUSH_DW_PARAMS flushDwParams; - MOS_ZeroMemory(&flushDwParams, sizeof(flushDwParams)); - DECODE_CHK_STATUS(m_miInterface->AddMiFlushDwCmd(&cmdBuffer, &flushDwParams)); - - // Check Huc auth: if equals to 0 continue chained BB until reset, otherwise send BB end cmd. - uint32_t compareOperation = mhw_mi_g12_X::MI_CONDITIONAL_BATCH_BUFFER_END_CMD::COMPARE_OPERATION_MADEQUALIDD; - DECODE_CHK_STATUS(m_hwInterface->SendCondBbEndCmd( - &m_hucAuthCheckBuf->OsResource, 0, 0, false, true, compareOperation, &cmdBuffer)); - - // Chained BB loop - DECODE_CHK_STATUS(static_cast(m_miInterface)->AddMiBatchBufferStartCmd(&cmdBuffer, m_batchBuf, true)); - - return MOS_STATUS_SUCCESS; - } -} diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.h deleted file mode 100644 index 4e5a5ab0bf9..00000000000 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_authcheck_packet_m12.h +++ /dev/null @@ -1,97 +0,0 @@ -/* -* Copyright (c) 2023, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ -//! -//! \file decode_huc_authcheck_packet_m12.h -//! \brief Defines the implementation of HuC authentication check packet -//! - -#ifndef __DECODE_HUC_AUTHCHECK_PACKET_M12_H__ -#define __DECODE_HUC_AUTHCHECK_PACKET_M12_H__ - -#include "decode_allocator.h" -#include "decode_utils.h" -#include "decode_pipeline.h" -#include "codechal_hw_g12_X.h" - -namespace decode -{ - class DecodeHucAuthCheckPktM12 - { - public: - DecodeHucAuthCheckPktM12(MediaPipeline *pipeline, CodechalHwInterface *hwInterface) - { - m_hwInterface = dynamic_cast(hwInterface); - m_pipeline = dynamic_cast(pipeline); - - if (hwInterface != nullptr) - { - m_miInterface = hwInterface->GetMiInterface(); - m_osInterface = hwInterface->GetOsInterface(); - m_hucInterface = hwInterface->GetHucInterface(); - } - } - virtual ~DecodeHucAuthCheckPktM12() {} - - //! - //! \brief Initialize the media packet, allocate required resources - //! \return MOS_STATUS - //! MOS_STATUS_SUCCESS if success, else fail reason - //! - MOS_STATUS Init(); - - //! - //! \brief Destroy allocated resources - //! \return MOS_STATUS - //! MOS_STATUS_SUCCESS if success, else fail reason - //! - MOS_STATUS Destroy(); - - //! - //! \brief Execute hevc picture packet - //! \return MOS_STATUS - //! MOS_STATUS_SUCCESS if success, else fail reason - //! - MOS_STATUS Execute(MOS_COMMAND_BUFFER &cmdBuffer); - - PMHW_BATCH_BUFFER GetSecondLvlBB() { return m_batchBuf; }; - - private: - MOS_STATUS Init2ndLevelCmdBuffer(MHW_BATCH_BUFFER &batchBuffer, uint8_t *batchBufBase); - - MOS_STATUS PackHucAuthCmds(MOS_COMMAND_BUFFER &cmdBuffer); - - PMOS_INTERFACE m_osInterface = nullptr; - CodechalHwInterfaceG12 *m_hwInterface = nullptr; - MhwMiInterface *m_miInterface = nullptr; - MhwVdboxHucInterface *m_hucInterface = nullptr; - - DecodePipeline *m_pipeline = nullptr; - DecodeAllocator *m_allocator = nullptr; - MOS_BUFFER *m_hucAuthCheckBuf = nullptr; //!< Pointer to Huc authentication buffer - BatchBufferArray *m_secondLevelBBArray = nullptr; //!< Pointer to second level batch buffer - PMHW_BATCH_BUFFER m_batchBuf = nullptr; - MOS_COMMAND_BUFFER m_hucAuthCmdBuffer = {}; - -MEDIA_CLASS_DEFINE_END(decode__HucAuthCheckPktM12) - }; -} // namespace decode -#endif diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.cpp index e12c74444b8..a5beb929aca 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.cpp +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2019-2023, Intel Corporation +* Copyright (c) 2019, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -44,24 +44,11 @@ namespace decode { DECODE_CHK_NULL(m_s2lDmemBufferArray); } - if (m_hucAuthPkt != nullptr) - { - // allocate resources for huc auth packet - DECODE_CHK_STATUS(m_hucAuthPkt->Init()); - } - return MOS_STATUS_SUCCESS; } MOS_STATUS HucS2lPktM12::Destroy() { - if (m_hucAuthPkt != nullptr) - { - // destroy resources allocated in huc auth packet - DECODE_CHK_STATUS(m_hucAuthPkt->Destroy()); - MOS_Delete(m_hucAuthPkt); - } - DECODE_CHK_STATUS(m_allocator->Destroy(m_s2lDmemBufferArray)); DECODE_CHK_STATUS(HucS2lPktXe_M_Base::Destroy()); return MOS_STATUS_SUCCESS; @@ -110,12 +97,6 @@ namespace decode { DECODE_CHK_NULL(m_hucInterface); - if (m_hucAuthPkt != nullptr) - { - // add huc auth check cmds - DECODE_CHK_STATUS(m_hucAuthPkt->Execute(cmdBuffer)); - } - if (prologNeeded) { DECODE_CHK_STATUS(AddForceWakeup(cmdBuffer, false, true)); diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.h index 6004d0d8088..e7916141cb0 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.h +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_m12.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2019-2023, Intel Corporation +* Copyright (c) 2019, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -29,7 +29,6 @@ #include "decode_huc_s2l_xe_m_base_packet.h" #include "codechal_hw_g12_X.h" -#include "decode_huc_authcheck_packet_m12.h" namespace decode { @@ -78,14 +77,6 @@ struct HucHevcS2lPicBssM12 : public HucHevcS2lPicBssXe_M_Base : HucS2lPktXe_M_Base(pipeline, task, hwInterface) { m_hwInterface = dynamic_cast(hwInterface); - if (m_hwInterface != nullptr) - { - MEDIA_WA_TABLE *waTable = m_hwInterface->GetWaTable(); - if (waTable && MEDIA_IS_WA(waTable, WaCheckHucAuthenticationStatus)) - { - m_hucAuthPkt = MOS_New(DecodeHucAuthCheckPktM12, pipeline, m_hwInterface); - } - } } virtual ~HucS2lPktM12() {} @@ -108,8 +99,6 @@ struct HucHevcS2lPicBssM12 : public HucHevcS2lPicBssXe_M_Base //! virtual MOS_STATUS Prepare() override; - PMHW_BATCH_BUFFER GetHucAuthCmdBuffer() { return m_hucAuthPkt ? m_hucAuthPkt->GetSecondLvlBB() : nullptr; }; - protected: virtual MOS_STATUS AllocateResources() override; virtual MOS_STATUS Destroy() override; @@ -129,8 +118,6 @@ struct HucHevcS2lPicBssM12 : public HucHevcS2lPicBssXe_M_Base CodechalHwInterfaceG12 *m_hwInterface = nullptr; BufferArray *m_s2lDmemBufferArray = nullptr; //!< S2L DMEM buffer array - - DecodeHucAuthCheckPktM12 *m_hucAuthPkt = nullptr; MEDIA_CLASS_DEFINE_END(decode__HucS2lPktM12) }; diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/media_srcs.cmake b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/media_srcs.cmake index c48fa4dac3e..1684e5aaa4e 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/media_srcs.cmake +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/packet/media_srcs.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, Intel Corporation +# Copyright (c) 2019-2021, Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -29,7 +29,6 @@ set(TMP_SOURCES_ ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_front_end_m12.cpp ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_long_m12.cpp ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_real_tile_m12.cpp - ${CMAKE_CURRENT_LIST_DIR}/decode_huc_authcheck_packet_m12.cpp ${CMAKE_CURRENT_LIST_DIR}/decode_huc_s2l_xe_m_base_packet.cpp ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_back_end_xe_m_base.cpp ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_front_end_xe_m_base.cpp @@ -50,7 +49,6 @@ set(TMP_HEADERS_ ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_front_end_m12.h ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_long_m12.h ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_real_tile_m12.h - ${CMAKE_CURRENT_LIST_DIR}/decode_huc_authcheck_packet_m12.h ${CMAKE_CURRENT_LIST_DIR}/decode_huc_s2l_xe_m_base_packet.h ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_back_end_xe_m_base.h ${CMAKE_CURRENT_LIST_DIR}/decode_hevc_packet_front_end_xe_m_base.h diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.cpp index 3450ad58f37..d51ce817327 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.cpp +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.cpp @@ -686,32 +686,6 @@ MOS_STATUS HevcPipelineM12::DumpParams(HevcBasicFeature &basicFeature) return MOS_STATUS_SUCCESS; } - -MOS_STATUS HevcPipelineM12::DumpSecondLevelBatchBuffer() -{ - DECODE_CHK_STATUS(HevcPipeline::DumpSecondLevelBatchBuffer()); - - if (m_basicFeature->m_shortFormatInUse) - { - // Dump HuC auth chained BB - auto hucS2LPkt = dynamic_cast(GetOrCreate(DecodePacketId(this, hucS2lPacketId))); - DECODE_CHK_NULL(hucS2LPkt); - - PMHW_BATCH_BUFFER batchBuffer = hucS2LPkt->GetHucAuthCmdBuffer(); - - if (batchBuffer != nullptr) - { - batchBuffer->iLastCurrent = batchBuffer->iSize * batchBuffer->count; - batchBuffer->dwOffset = 0; - DECODE_CHK_STATUS(m_debugInterface->Dump2ndLvlBatch( - batchBuffer, - CODECHAL_NUM_MEDIA_STATES, - "HEVC_DEC_HucAuth")); - } - } - - return MOS_STATUS_SUCCESS; -} #endif } diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.h index cd7665a9b97..2ed588ece5e 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.h +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline_m12.h @@ -157,13 +157,6 @@ class HevcPipelineM12 : public HevcPipeline, public HucPacketCreatorG12 //! MOS_STATUS_SUCCESS if success, else fail reason //! MOS_STATUS DumpParams(HevcBasicFeature &basicFeature); - - //! \brief Dump the second level batch buffer - //! - //! \return MOS_STATUS - //! MOS_STATUS_SUCCESS if success, else fail reason - //! - virtual MOS_STATUS DumpSecondLevelBatchBuffer() override; #endif private: diff --git a/media_softlet/agnostic/common/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline.h b/media_softlet/agnostic/common/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline.h index 1fe89774c0e..2528d354d6e 100644 --- a/media_softlet/agnostic/common/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline.h +++ b/media_softlet/agnostic/common/codec/hal/dec/hevc/pipeline/decode_hevc_pipeline.h @@ -283,7 +283,7 @@ class HevcPipeline : public DecodePipeline //! \return MOS_STATUS //! MOS_STATUS_SUCCESS if success, else fail reason //! - virtual MOS_STATUS DumpSecondLevelBatchBuffer(); + MOS_STATUS DumpSecondLevelBatchBuffer(); #endif protected: