Skip to content

Reorder delete of OsInterface and MhwInterface #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dvrogozh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reorder delete of OsInterface and MhwInterface #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions media_driver/media_interface/media_interfaces_dg2/media_interfaces_dg2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,12 @@ MOS_STATUS McpyDeviceXe_Hpm::Initialize(
MhwInterfaces* mhwInterfaces = nullptr;

auto deleterOnFailure = [&](bool deleteOsInterface, bool deleteMhwInterface){
if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

if (deleteOsInterface && osInterface != nullptr)
{
if (osInterface->pfnDestroy)
Expand All @@ -362,12 +368,6 @@ MOS_STATUS McpyDeviceXe_Hpm::Initialize(
MOS_FreeMemory(osInterface);
}

if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

MOS_Delete(device);
};

Expand Down Expand Up @@ -1113,4 +1113,4 @@ MOS_STATUS CodechalInterfacesXe_Hpm::CreateCodecHalInterface(MhwInterfaces *mhwI
}
#endif // USE_CODECHAL_DEBUG_TOOL
return MOS_STATUS_SUCCESS;
}
}
14 changes: 7 additions & 7 deletions media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,12 @@ MOS_STATUS McpyDeviceG12Tgllp::Initialize(
MhwInterfaces* mhwInterfaces = nullptr;

auto deleterOnFailure = [&](bool deleteOsInterface, bool deleteMhwInterface){
if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

if (deleteOsInterface && osInterface != nullptr)
{
if (osInterface->pfnDestroy)
Expand All @@ -424,12 +430,6 @@ MOS_STATUS McpyDeviceG12Tgllp::Initialize(
MOS_FreeMemory(osInterface);
}

if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

MOS_Delete(device);
};

Expand Down Expand Up @@ -1012,4 +1012,4 @@ MOS_STATUS MediaInterfacesHwInfoDeviceG12Tgllp::Initialize(PLATFORM platform)
{
m_hwInfo.SetDeviceInfo(IP_VERSION_M12_0, platform.usRevId);
return MOS_STATUS_SUCCESS;
}
}
12 changes: 6 additions & 6 deletions media_driver/media_interface/media_interfaces_pvc/media_interfaces_pvc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,12 @@ MOS_STATUS McpyDeviceXe_Xpm_Plus::Initialize(
MhwInterfaces* mhwInterfaces = nullptr;

auto deleterOnFailure = [&](bool deleteOsInterface, bool deleteMhwInterface){
if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

if (deleteOsInterface && osInterface != nullptr)
{
if (osInterface->pfnDestroy)
Expand All @@ -342,12 +348,6 @@ MOS_STATUS McpyDeviceXe_Xpm_Plus::Initialize(
MOS_FreeMemory(osInterface);
}

if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

MOS_Delete(device);
};

Expand Down
12 changes: 6 additions & 6 deletions media_driver/media_interface/media_interfaces_xehp_sdv/media_interfaces_xehp_sdv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,12 @@ MOS_STATUS McpyDeviceXe_Xpm::Initialize(
MhwInterfaces* mhwInterfaces = nullptr;

auto deleterOnFailure = [&](bool deleteOsInterface, bool deleteMhwInterface){
if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

if (deleteOsInterface && osInterface != nullptr)
{
if (osInterface->pfnDestroy)
Expand All @@ -320,12 +326,6 @@ MOS_STATUS McpyDeviceXe_Xpm::Initialize(
MOS_FreeMemory(osInterface);
}

if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

MOS_Delete(device);
};

Expand Down
12 changes: 6 additions & 6 deletions media_softlet/agnostic/common/media_interfaces/media_interfaces_mcpy_next.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ class McpyDeviceNext_T : public McpyDeviceNext
Mhw *mhwInterfaces = nullptr;

auto deleterOnFailure = [&](bool deleteOsInterface, bool deleteMhwInterface) {
if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

if (deleteOsInterface && osInterface != nullptr)
{
if (osInterface->pfnDestroy)
Expand All @@ -99,12 +105,6 @@ class McpyDeviceNext_T : public McpyDeviceNext
MOS_FreeMemory(osInterface);
}

if (deleteMhwInterface && mhwInterfaces != nullptr)
{
mhwInterfaces->Destroy();
MOS_Delete(mhwInterfaces);
}

MOS_Delete(device);
};

Expand Down
Loading